diff --git a/PuzzleGameProject/Assets/Scripts/GameManager.cs b/PuzzleGameProject/Assets/Scripts/GameManager.cs
index d9a3c98..97f03e3 100644
--- a/PuzzleGameProject/Assets/Scripts/GameManager.cs
+++ b/PuzzleGameProject/Assets/Scripts/GameManager.cs
@@ -144,9 +144,16 @@ public class GameManager : MonoBehaviour
     }
 
     private void PassRequested(object sender, EventArgs e) {
-        if (state is GameState.PickDiceOne or GameState.PickDiceTwo)
+        switch (state)
         {
-            PassTurn();
+            case GameState.PickDiceOne:
+            case GameState.PickDiceTwo:
+            case GameState.PickRoomOne:
+            case GameState.PickRoomTwo:
+                PassTurn();
+                break;
+            default:
+                return;
         }
     }
 }