diff --git a/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs b/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs
index 1470a209e..fc445ec9d 100644
--- a/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs
+++ b/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs
@@ -123,7 +123,9 @@ namespace MediaBrowser.Server.Implementations.WebSocket
         {
             if (WebSocketServer != null)
             {
+                WebSocketServer.Stop();
                 WebSocketServer.Dispose();
+                WebSocketServer = null;
             }
         }
     }