diff --git a/hooks/useGame.ts b/hooks/useGame.ts
index 74488fe..5b58a31 100644
--- a/hooks/useGame.ts
+++ b/hooks/useGame.ts
@@ -1507,6 +1507,9 @@ export const useGame = (defaultGameConfig?: GameConfig) => {
         setGameState('LOBBY');
         setHasAnswered(false);
       }
+      if (payload.timerEnabled !== undefined) {
+        setGameConfig(prev => ({ ...prev, timerEnabled: payload.timerEnabled! }));
+      }
     }
     
     if (data.type === 'START_COUNTDOWN') {
@@ -1546,6 +1549,9 @@ export const useGame = (defaultGameConfig?: GameConfig) => {
         if (data.payload.timerEnabled !== false) {
           timerRef.current = setInterval(() => setTimeLeft(prev => Math.max(0, prev - 100)), 100);
         }
+        if (data.payload.timerEnabled !== undefined) {
+          setGameConfig(prev => ({ ...prev, timerEnabled: data.payload.timerEnabled! }));
+        }
     }
 
     if (data.type === 'RESULT') {