diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index f08dcc5e8..3b538cb32 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -172,7 +172,7 @@ export class GameServer {
       client.isDisconnected = existing.isDisconnected;
       client.lastPing = existing.lastPing;
 
-      existing.ws.removeAllListeners("message");
+      existing.ws.removeAllListeners();
       this.activeClients = this.activeClients.filter((c) => c !== existing);
     }
 
@@ -183,6 +183,8 @@ export class GameServer {
     this.allClients.set(client.clientID, client);
 
     client.ws.removeAllListeners("message");
+    client.ws.removeAllListeners("close");
+    client.ws.removeAllListeners("error");
     client.ws.on(
       "message",
       gatekeeper.wsHandler(client.ip, async (message: string) => {
@@ -240,7 +242,6 @@ export class GameServer {
         }
       }),
     );
-    client.ws.removeAllListeners("close");
     client.ws.on("close", () => {
       this.log.info("client disconnected", {
         clientID: client.clientID,
@@ -250,7 +251,6 @@ export class GameServer {
         (c) => c.clientID !== client.clientID,
       );
     });
-    client.ws.removeAllListeners("error");
     client.ws.on("error", (error: Error) => {
       if ((error as any).code === "WS_ERR_UNEXPECTED_RSV_1") {
         client.ws.close(1002, "WS_ERR_UNEXPECTED_RSV_1");
diff --git a/src/server/Server.ts b/src/server/Server.ts
index 8486f974a..f47fe2fc1 100644
--- a/src/server/Server.ts
+++ b/src/server/Server.ts
@@ -42,7 +42,8 @@ async function setupTunnels() {
 
   const domainToService = new Map<string, string>().set(
     config.subdomain(),
-    `http://localhost:3000`,
+    // TODO: change to 3000 when we have a proper tunnel setup.
+    `http://localhost:80`,
   );
 
   for (let i = 0; i < config.numWorkers(); i++) {