diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 749b72a277e..0c0d1be8836 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -892,9 +892,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             do {
                 selectedCards = decider.getController().chooseCardsForZoneChange(destination, origin, sa, fetchList, delayedReveal, selectPrompt, decider);
             } while (selectedCards != null && selectedCards.size() > changeNum);
-            for (Card card : selectedCards) {
-                chosenCards.add(card);
-            };
+            if (selectedCards != null) {
+                for (Card card : selectedCards) {
+                    chosenCards.add(card);
+                }
+            }
             // maybe prompt the user if they selected fewer than the maximum possible?
         } else {
             // one at a time