diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
index ba6e4153af3..46617b333ac 100644
--- a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
+++ b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
@@ -49,7 +49,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
         List<Player> tgtPlayers = getTargetPlayers(sa);
         final Game game = sa.getActivatingPlayer().getGame();
 
-        if (!sa.usesTargeting() || sa.hasParam("UseAllOriginZones")) {
+        if ((tgtPlayers == null) || tgtPlayers.isEmpty() || sa.hasParam("UseAllOriginZones")) {
             cards = game.getCardsIn(origin);
         } else if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) {
             // Search library using changezoneall effect need a param "Search"