diff --git a/index.js b/index.js
index 4c9fb29..5150d70 100644
--- a/index.js
+++ b/index.js
@@ -54,7 +54,13 @@ const playerRoomMap = new Map();
 const handleDisconnect = (socket, playerRoomMap) => {
     const playerRoom = playerRoomMap.get(socket.id);
     if (playerRoom) {
+        if (playerRoom.currentPlayer === socket.id) {
+            playerRoom.currentPlayer = getNextPlayer(playerRoom.players, socket.id);
+        }
         playerRoom.players = playerRoom.players.filter(user => user.socketId !== socket.id);
+        if (checkLoseCondition(playerRoom.players)) {
+            playerRoom.gameState = "lost";
+        }
         io.to(playerRoom.id).emit('roomUserLeft', buildRoomView(playerRoom));
     }
     playerRoomMap.delete(socket.id);