Merge branch 'master' into comparisons

1 files changed, 7 insertions, 2 deletions

diff --git a/Jellyfin.Server.Implementations/Events/EventManager.cs b/Jellyfin.Server.Implementations/Events/EventManager.cs
index 707002442..8c5d8f2ce 100644
--- a/Jellyfin.Server.Implementations/Events/EventManager.cs
+++ b/Jellyfin.Server.Implementations/Events/EventManager.cs
@@ -30,7 +30,7 @@ namespace Jellyfin.Server.Implementations.Events
         public void Publish<T>(T eventArgs)
             where T : EventArgs
         {
-            Task.WaitAll(PublishInternal(eventArgs));
+            PublishInternal(eventArgs).GetAwaiter().GetResult();
         }
 
         /// <inheritdoc />
@@ -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