diff --git a/src/hooks/useRoom.js b/src/hooks/useRoom.js
index bd16dd5..a5fccff 100644
--- a/src/hooks/useRoom.js
+++ b/src/hooks/useRoom.js
@@ -72,9 +72,9 @@ export const useRoom = (roomCode, onGameStarted = null) => {
 
     const handleGameEnded = (data) => {
       console.log('Game ended:', data);
-      if (room) {
-        setRoom({ ...room, status: 'FINISHED' });
-      }
+      setRoom((prevRoom) => 
+        prevRoom ? { ...prevRoom, status: 'FINISHED' } : null
+      );
     };
 
     const handleRoomPackUpdated = (updatedRoom) => {
@@ -99,7 +99,7 @@ export const useRoom = (roomCode, onGameStarted = null) => {
       socketService.off('gameEnded', handleGameEnded);
       socketService.off('roomPackUpdated', handleRoomPackUpdated);
     };
-  }, [roomCode, onGameStarted, room]);
+  }, [roomCode, onGameStarted, user?.id]);
 
   const createRoom = useCallback(async (hostId, questionPackId, settings = {}) => {
     try {