diff --git a/apps/server/src/network/handlers/registerConnectionHandlers.ts b/apps/server/src/network/handlers/registerConnectionHandlers.ts
index 88a7fac..b497f8c 100644
--- a/apps/server/src/network/handlers/registerConnectionHandlers.ts
+++ b/apps/server/src/network/handlers/registerConnectionHandlers.ts
@@ -44,6 +44,10 @@
       const roomId = roomManager.getRoomByPlayerId(socket.id)?.roomId;
       handleGameDisconnect(io, gameManager, roomId, socket.id);
       handleRoomDisconnect(io, socket, roomManager);
+
+      if (roomId && !roomManager.getRoomById(roomId)) {
+        gameManager.stopGameLoop(roomId);
+      }
     });
   });
 };