diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 6b69fa0f4..5b1cb433a 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -803,7 +803,6 @@ namespace Emby.Server.Implementations.HttpServer
 
         private bool _disposed;
         private readonly object _disposeLock = new object();
-        private readonly WebSocketSharpListener _websocketlistener;
 
         protected virtual void Dispose(bool disposing)
         {
diff --git a/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
index 7a6144fb2..77469244b 100644
--- a/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
@@ -17,8 +17,6 @@ using Microsoft.Extensions.Logging;
 {
     public class WebSocketSharpListener : IHttpListener
     {
-        private HttpListener _listener;
-
         private readonly ILogger _logger;
 
         private CancellationTokenSource _disposeCancellationTokenSource = new CancellationTokenSource();
@@ -86,14 +84,14 @@ using Microsoft.Extensions.Logging;
 
                     do
                     {
-                        result = await webSocketContext.ReceiveAsync(buffer, CancellationToken.None);
+                        result = await webSocketContext.ReceiveAsync(buffer, _disposeCancellationToken);
                         socket.OnReceiveBytes(buffer.Array);
                         message.AddRange(buffer.Array.Take(result.Count));
                     } while (!result.EndOfMessage && result.MessageType != WebSocketMessageType.Close);
 
                     socket.OnReceiveBytes(message.ToArray());
                     await webSocketContext.CloseAsync(result.CloseStatus ?? WebSocketCloseStatus.NormalClosure,
-                        result.CloseStatusDescription, CancellationToken.None);
+                        result.CloseStatusDescription, _disposeCancellationToken);
                     socket.Dispose();
                 }
                 else
@@ -109,16 +107,9 @@ using Microsoft.Extensions.Logging;
             }
         }
 
-        public void Start(IEnumerable<string> urlPrefixes)
-        {
-            throw new NotImplementedException();
-        }
-
         public Task Stop()
         {
             _disposeCancellationTokenSource.Cancel();
-            _listener?.Close();
-
             return Task.CompletedTask;
         }