1 files changed, 6 insertions, 1 deletions
diff --git a/Jellyfin.Server.Implementations/Events/EventManager.cs b/Jellyfin.Server.Implementations/Events/EventManager.cs
index 707002442..c5e66112d 100644
--- a/Jellyfin.Server.Implementations/Events/EventManager.cs
+++ b/Jellyfin.Server.Implementations/Events/EventManager.cs
@@ -43,7 +43,12 @@ namespace Jellyfin.Server.Implementations.Events
         private async Task PublishInternal<T>(T eventArgs)
             where T : EventArgs
         {
-            using var scope = _appHost.ServiceProvider.CreateScope();
+            using var scope = _appHost.ServiceProvider?.CreateScope();
+            if (scope == null)
+            {
+                return;
+            }
+
             foreach (var service in scope.ServiceProvider.GetServices<IEventConsumer<T>>())
             {
                 try