diff --git a/app/maze.tsx b/app/maze.tsx
index 50aab84..e531185 100644
--- a/app/maze.tsx
+++ b/app/maze.tsx
@@ -672,7 +672,7 @@ function Maze({ game_uuid, shape, walls, food, bots, team_names, say, whowins, g
             dominantBaseline="middle"
             textAnchor="middle"
           >
-            { whowins == 2 ? "DRAW" : `${team_names[whowins]} wins!` }
+            { whowins == null || whowins == 2 ? "DRAW" : `${team_names[whowins]} wins!` }
           </text>
           </>) : null
         }
diff --git a/app/pelita.tsx b/app/pelita.tsx
index 4e70372..6c2084c 100644
--- a/app/pelita.tsx
+++ b/app/pelita.tsx
@@ -193,7 +193,7 @@ function Pelita() {
 
           {state === "intro" ? showIntro() : null}
 
-          {state === "match" ?
+          {state === "match" && gameState ?
             <PelitaMain gameState={gameState}></PelitaMain>
             : null
           }