diff --git a/forge-gui/src/main/java/forge/match/input/InputSyncronizedBase.java b/forge-gui/src/main/java/forge/match/input/InputSyncronizedBase.java
index f9dcef5ef38..654c983ae9e 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSyncronizedBase.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSyncronizedBase.java
@@ -46,7 +46,9 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
         });
 
         // thread irrelevant
-        getController().getInputQueue().removeInput(InputSyncronizedBase.this);
+        if (getController().getInputQueue().getInput() != null) {
+            getController().getInputQueue().removeInput(InputSyncronizedBase.this);
+        }
         cdlDone.countDown();
     }