diff --git a/lib/presentation/views/create_game_view.dart b/lib/presentation/views/create_game_view.dart
index d80d0fb..a1b5894 100644
--- a/lib/presentation/views/create_game_view.dart
+++ b/lib/presentation/views/create_game_view.dart
@@ -396,7 +396,7 @@ class _CreateGameViewState extends State<CreateGameView> {
       isPointsLimitEnabled: isPointsLimitEnabled,
     );
     gameManager.addGameSession(gameSession);
-    final session = gameManager.getGameSessionById(id)!;
+    final session = gameManager.getGameSessionById(id) ?? gameSession;
 
     Navigator.pushReplacement(
         context,