diff --git a/src/index.ts b/src/index.ts
index 9417ee2..380dec9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -49,6 +49,7 @@ const app = new Elysia()
     }
 
     let gameId = query.gameId as string | undefined;
+    let gameIdInitialized = false;
     if (gameId) {
       if (!wsHandler.hasGame(gameId)) {
         wsHandler.createGame(gameId);
@@ -56,9 +57,17 @@ const app = new Elysia()
       }
     } else {
       gameId = wsHandler.createGame();
+      gameIdInitialized = true;
       console.log(`Created new game without specific ID: ${gameId}`);
     }
 
+    if (gameIdInitialized) {
+      return new Response(null, {
+        status: 302,
+        headers: { Location: `/?gameId=${gameId}` },
+      });
+    }
+
     const displayName = wsHandler.getPlayerName(playerId);
 
     const htmlTemplate = await Bun.file('./index.html').text();
diff --git a/src/web-socket-handler.tsx b/src/web-socket-handler.tsx
index 431264a..cf8e705 100644
--- a/src/web-socket-handler.tsx
+++ b/src/web-socket-handler.tsx
@@ -54,15 +54,25 @@ class GameServer {
 
   public handleConnection(ws: WS) {
     const { playerId } = ws.data.query;
-    const playerName = this.webSocketHandler.getPlayerName(playerId); // Retrieve name or use ID
-    const conn = new PlayerConnection(playerId, playerName, ws);
-    this.connections.set(playerId, conn);
-    console.log(`Created connection with player ${conn.id} in game ${this.id}`);
+    if (this.connections.has(playerId)) {
+      const existingConn = this.connections.get(playerId)!;
+      existingConn.ws = ws; // Update with new WebSocket
+      console.log(
+        `Updated connection for player ${playerId} in game ${this.id}, replacing old WS.`,
+      );
+    } else {
+      const playerName = this.webSocketHandler.getPlayerName(playerId); // Retrieve name or use ID
+      const conn = new PlayerConnection(playerId, playerName, ws);
+      this.connections.set(playerId, conn);
+      console.log(
+        `Created new connection with player ${conn.id} in game ${this.id}`,
+      );
 
-    if (!this.blackPlayerId) {
-      this.blackPlayerId = conn.id;
-    } else if (!this.whitePlayerId) {
-      this.whitePlayerId = conn.id;
+      if (!this.blackPlayerId) {
+        this.blackPlayerId = conn.id;
+      } else if (!this.whitePlayerId) {
+        this.whitePlayerId = conn.id;
+      }
     }
     if (this.whitePlayerId && this.blackPlayerId) {
       this.gomoku.status = 'playing';
@@ -76,6 +86,7 @@ class GameServer {
   public handleDisconnect(ws: WS) {
     const { playerId } = ws.data.query;
     this.connections.delete(playerId);
+    this.broadcastTitle();
   }
 
   public broadcastBoard() {
@@ -734,7 +745,7 @@ export class WebSocketHandler {
     game.handleDisconnect(ws);
     console.log(`${playerId} disconnected from game ${gameId}`);
 
-    if (game.connections.entries.length == 0) {
+    if (game.connections.size == 0) {
       this.games.delete(gameId);
       console.log(`Game ${gameId} has been deleted (empty).`);
     }