diff --git a/src/main/scala/net/eagle0/eagle/service/GamesManager.scala b/src/main/scala/net/eagle0/eagle/service/GamesManager.scala
index b48ba43c78..e17aef0454 100644
--- a/src/main/scala/net/eagle0/eagle/service/GamesManager.scala
+++ b/src/main/scala/net/eagle0/eagle/service/GamesManager.scala
@@ -2523,7 +2523,7 @@ class GamesManager(
                 case Some(error) => Left(error)
                 case None        =>
                   // If game is loaded, unload it only after the target is validated — rewind will invalidate in-memory state.
-                  if gameControllerInfos.contains(gameId) then {
+                  if state.hasControllerInfo(gameId) then {
                     shardokClient.cancelBattlesForGame(gameId)
                     unloadGame(gameId): Unit
                   }
@@ -2545,7 +2545,7 @@ class GamesManager(
     }
 
     // If game is loaded, unload it — rewind will invalidate in-memory state
-    if gameControllerInfos.contains(gameId) then {
+    if state.hasControllerInfo(gameId) then {
       shardokClient.cancelBattlesForGame(gameId)
       unloadGame(gameId): Unit
     }