diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
index 46617b333ac..bc81e11d6e9 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 ((tgtPlayers == null) || tgtPlayers.isEmpty() || sa.hasParam("UseAllOriginZones")) {
+        if ((!sa.usesTargeting() && !sa.hasParam("Defined")) || 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"
diff --git a/src/main/java/forge/card/ability/effects/TapAllEffect.java b/src/main/java/forge/card/ability/effects/TapAllEffect.java
index 34cd94ab73d..4383249d819 100644
--- a/src/main/java/forge/card/ability/effects/TapAllEffect.java
+++ b/src/main/java/forge/card/ability/effects/TapAllEffect.java
@@ -40,7 +40,7 @@ public class TapAllEffect extends SpellAbilityEffect {
 
         final List<Player> tgtPlayers = getTargetPlayers(sa);
 
-        if (!sa.usesTargeting()) {
+        if (!sa.usesTargeting() && !sa.hasParam("Defined")) {
             cards = game.getCardsIn(ZoneType.Battlefield);
         } else {
             cards = new ArrayList<Card>();
diff --git a/src/main/java/forge/card/ability/effects/UntapAllEffect.java b/src/main/java/forge/card/ability/effects/UntapAllEffect.java
index aaedcba33eb..ddccc7beb57 100644
--- a/src/main/java/forge/card/ability/effects/UntapAllEffect.java
+++ b/src/main/java/forge/card/ability/effects/UntapAllEffect.java
@@ -38,7 +38,7 @@ public class UntapAllEffect extends SpellAbilityEffect {
             valid = sa.getParam("ValidCards");
         }
 
-        if (!sa.usesTargeting()) {
+        if (!sa.usesTargeting() && !sa.hasParam("Defined")) {
             list = sa.getActivatingPlayer().getGame().getCardsIn(ZoneType.Battlefield);
         } else {
             list = new ArrayList<Card>();