diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index c1093dd27..e8480e7d0 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -183,9 +183,7 @@ export class GameServer {
 
     this.allClients.set(client.clientID, client);
 
-    client.ws.removeAllListeners("message");
-    client.ws.removeAllListeners("close");
-    client.ws.removeAllListeners("error");
+    client.ws.removeAllListeners();
     client.ws.on(
       "message",
       gatekeeper.wsHandler(client.ip, async (message: string) => {
@@ -405,7 +403,7 @@ export class GameServer {
     // Close all WebSocket connections
     clearInterval(this.endTurnIntervalID);
     this.allClients.forEach((client) => {
-      client.ws.removeAllListeners("message");
+      client.ws.removeAllListeners();
       if (client.ws.readyState === WebSocket.OPEN) {
         client.ws.close(1000, "game has ended");
       }
@@ -559,6 +557,7 @@ export class GameServer {
         this.activeClients = this.activeClients.filter(
           (c) => c.clientID !== clientID,
         );
+        client.ws.removeAllListeners();
         this.kickedClients.add(clientID);
       }, 100);
     } else {
diff --git a/src/server/Worker.ts b/src/server/Worker.ts
index 2c6476b57..96efde652 100644
--- a/src/server/Worker.ts
+++ b/src/server/Worker.ts
@@ -457,6 +457,8 @@ export function startWorker() {
 
           // Handle other message types
         } catch (error) {
+          ws.removeAllListeners();
+          ws.close(1011, "Internal server error");
           log.warn(
             `error handling websocket message for ${ipAnonymize(ip)}: ${error}`.substring(
               0,
@@ -473,6 +475,9 @@ export function startWorker() {
         ws.close(1002, "WS_ERR_UNEXPECTED_RSV_1");
       }
     });
+    ws.on("close", () => {
+      ws.removeAllListeners();
+    });
   });
 
   // The load balancer will handle routing to this server based on path