diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index cc82156e8..08481f09f 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -114,7 +114,13 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (session != null)
             {
-                var controller = new WebSocketController(session, _appHost);
+                var controller = session.SessionController as WebSocketController;
+
+                if (controller == null)
+                {
+                    controller = new WebSocketController(session, _appHost);
+                }
+
                 controller.Sockets.Add(message.Connection);
 
                 session.SessionController = controller;