1 files changed, 2 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 81736f053..6db832b79 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -121,7 +121,6 @@ namespace Emby.Server.Implementations
         private SqliteUserRepository _userRepository;
         private SqliteDisplayPreferencesRepository _displayPreferencesRepository;
         private ISessionManager _sessionManager;
-        private INotificationManager _notificationManager;
         private IHttpServer _httpServer;
 
         /// <summary>
@@ -283,10 +282,6 @@ namespace Emby.Server.Implementations
 
         internal SqliteItemRepository ItemRepository { get; set; }
 
-        
-
-        private ISubtitleManager SubtitleManager { get; set; }
-
         private IDeviceManager DeviceManager { get; set; }
 
         private IAuthenticationRepository AuthenticationRepository { get; set; }
@@ -748,8 +743,7 @@ namespace Emby.Server.Implementations
             MediaSourceManager = new MediaSourceManager(ItemRepository, ApplicationPaths, LocalizationManager, UserManager, LibraryManager, LoggerFactory, JsonSerializer, FileSystemManager, UserDataManager, () => MediaEncoder);
             serviceCollection.AddSingleton(MediaSourceManager);
 
-            SubtitleManager = new SubtitleManager(LoggerFactory, FileSystemManager, LibraryMonitor, MediaSourceManager, LocalizationManager);
-            serviceCollection.AddSingleton(SubtitleManager);
+            serviceCollection.AddSingleton<ISubtitleManager, SubtitleManager>();
 
             serviceCollection.AddSingleton<IProviderManager, ProviderManager>();
 
@@ -1012,7 +1006,7 @@ namespace Emby.Server.Implementations
 
             Resolve<ILiveTvManager>().AddParts(GetExports<ILiveTvService>(), GetExports<ITunerHost>(), GetExports<IListingsProvider>());
 
-            SubtitleManager.AddParts(GetExports<ISubtitleProvider>());
+            Resolve<ISubtitleManager>().AddParts(GetExports<ISubtitleProvider>());
 
             Resolve<IChannelManager>().AddParts(GetExports<IChannel>());