diff --git a/src/main/java/forge/control/input/InputControl.java b/src/main/java/forge/control/input/InputControl.java
index d9b579d0eab..b4b48c19020 100644
--- a/src/main/java/forge/control/input/InputControl.java
+++ b/src/main/java/forge/control/input/InputControl.java
@@ -125,15 +125,14 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      */
     public final Input getActualInput(GameState game) {
         GameAge age = game.getAge();
-
-        if ( age == GameAge.BeforeMulligan || age == GameAge.GameOver) 
-            return inputLock;
-
         if ( age == GameAge.Mulligan ) {
             HumanPlayer human = Singletons.getControl().getPlayer();
             return game.getType() == GameType.Commander ? new InputPartialParisMulligan(match, human) : new InputMulligan(match, human);
         }
 
+        if ( age != GameAge.Play ) 
+            return inputLock;
+
         if (!this.inputStack.isEmpty()) { // incoming input to Control
             return this.inputStack.peek();
         }