diff --git a/src/main/java/forge/card/ability/ai/UntapAllAi.java b/src/main/java/forge/card/ability/ai/UntapAllAi.java
index c2b53dfa1b3..8cf2becbcd9 100644
--- a/src/main/java/forge/card/ability/ai/UntapAllAi.java
+++ b/src/main/java/forge/card/ability/ai/UntapAllAi.java
@@ -1,18 +1,31 @@
 package forge.card.ability.ai;
 
+import java.util.List;
+
+import forge.Card;
+import forge.CardLists;
+import forge.Singletons;
 import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.game.player.AIPlayer;
+import forge.game.zone.ZoneType;
 
 public class UntapAllAi extends SpellAbilityAi {
 
     @Override
     protected boolean canPlayAI(AIPlayer aiPlayer, SpellAbility sa) {
-        // check SubAbilities DoTrigger?
+        final Card source = sa.getSourceCard();
+
         final AbilitySub abSub = sa.getSubAbility();
         if (abSub != null) {
-            return true;
+            String valid = "";
+            List<Card> list = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield);
+            if (sa.hasParam("ValidCards")) {
+                valid = sa.getParam("ValidCards");
+            }
+            list = CardLists.getValidCards(list, valid.split(","), source.getController(), source);
+            return !list.isEmpty();
         }
         return false;
     }