1 files changed, 5 insertions, 9 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index b3d2b9cc2..d8938964f 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -805,19 +805,15 @@ namespace Emby.Server.Implementations.HttpServer
 
             Logger.LogDebug("Websocket message received: {0}", result.MessageType);
 
-            var tasks = _webSocketListeners.Select(i => Task.Run(async () =>
+            IEnumerable<Task> GetTasks()
             {
-                try
-                {
-                    await i.ProcessMessage(result).ConfigureAwait(false);
-                }
-                catch (Exception ex)
+                foreach (var x in _webSocketListeners)
                 {
-                    Logger.LogError(ex, "{0} failed processing WebSocket message {1}", i.GetType().Name, result.MessageType ?? string.Empty);
+                    yield return x.ProcessMessageAsync(result);
                 }
-            }));
+            }
 
-            return Task.WhenAll(tasks);
+            return Task.WhenAll(GetTasks());
         }
 
         public void Dispose()