diff --git a/lib/chess_bloc/chess_position.dart b/lib/chess_bloc/chess_position.dart
index af3223a..2133a04 100644
--- a/lib/chess_bloc/chess_position.dart
+++ b/lib/chess_bloc/chess_position.dart
@@ -6,9 +6,8 @@ typedef ChessMoveHistory = List<ChessMove>;
 
 class ChessPosition {
   static ChessPosition _instance = ChessPosition._internal();
-  final ChessPositionType position;
-
   static ChessMoveHistory history = ChessMoveHistory.empty(growable: true);
+  final ChessPositionType position;
 
   static ChessPosition getInstance() {
     return _instance;
diff --git a/lib/connection/ws_connection.dart b/lib/connection/ws_connection.dart
index 53aa9f2..d129aa3 100644
--- a/lib/connection/ws_connection.dart
+++ b/lib/connection/ws_connection.dart
@@ -73,7 +73,6 @@ class ServerConnection {
   }
 
   void handleIncomingColorDeterminedMessage(ApiWebsocketMessage apiMessage) {
-    ChessBloc.getInstance().add(InitBoard());
     ChessBloc.getInstance().add(
         ColorDetermined(myColor: ChessColor.fromApiColor(apiMessage.color!)));
   }
diff --git a/lib/pages/prepare_chess_game.dart b/lib/pages/prepare_chess_game.dart
index cd40448..787b727 100644
--- a/lib/pages/prepare_chess_game.dart
+++ b/lib/pages/prepare_chess_game.dart
@@ -5,6 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart';
 import 'package:mchess/api/register.dart';
+import 'package:mchess/chess_bloc/chess_bloc.dart';
+import 'package:mchess/chess_bloc/chess_events.dart';
 import 'package:mchess/pages/chess_game.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
@@ -21,6 +23,7 @@ class _PrepareChessGameWidgetState extends State<PrepareChessGameWidget> {
 
   @override
   void initState() {
+    ChessBloc.getInstance().add(InitBoard());
     randomGameResponse = registerForRandomGame();
     super.initState();
   }