diff --git a/frontend/src/lib/components/ChessGameOverlay.svelte b/frontend/src/lib/components/ChessGameOverlay.svelte
index fc4cfe7..55980b8 100644
--- a/frontend/src/lib/components/ChessGameOverlay.svelte
+++ b/frontend/src/lib/components/ChessGameOverlay.svelte
@@ -124,9 +124,17 @@
     function handleGameState(payload) {
         if (payload.status === 'waiting') {
             myColor = payload.yourColor;
+
+            // Load the Chess960 starting position
+            if (game && payload.fen) {
+                game.load(payload.fen);
+                updateBoardDisplay();
+            }
+
             gamesOverlay.setMode('waiting');
             gamesOverlay.updateState({
                 positionId: payload.positionId,
+                fen: payload.fen,
                 whiteName: payload.whiteName,
                 blackName: payload.blackName
             });