diff --git a/cmd/client/main.go b/cmd/client/main.go
index 61e5647..e4f1f3d 100644
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@@ -269,10 +269,14 @@ func (g *Game) Update() error {
 		}
 	}
 
-	// RUNNING-Übergang: AppState auf StateGame setzen + Musik starten
-	if g.gameState.Status == "RUNNING" && g.lastStatus != "RUNNING" {
-		log.Printf("🎮 Spiel startet! Status: %s -> %s", g.lastStatus, g.gameState.Status)
+	// COUNTDOWN/RUNNING-Übergang: AppState auf StateGame setzen + JS benachrichtigen
+	newStatus := g.gameState.Status
+	if (newStatus == "COUNTDOWN" || newStatus == "RUNNING") && g.appState != StateGame {
+		log.Printf("🎮 Spiel startet! Status: %s -> %s", g.lastStatus, newStatus)
 		g.appState = StateGame
+		g.notifyGameStarted()
+	}
+	if newStatus == "RUNNING" && g.lastStatus != "RUNNING" {
 		g.audio.PlayMusic()
 	}
 	// Musik stoppen wenn Game Over
@@ -434,13 +438,6 @@ func (g *Game) updateLobby() {
 		g.sendLobbyUpdateToJS()
 	}
 
-	// Spiel wurde gestartet?
-	if g.gameState.Status == "COUNTDOWN" || g.gameState.Status == "RUNNING" {
-		if g.appState != StateGame {
-			g.appState = StateGame
-			g.notifyGameStarted() // Benachrichtige JavaScript dass Spiel startet
-		}
-	}
 }
 
 // --- DRAW ---