diff --git a/forge-ai/src/main/java/forge/ai/ability/AnimateAllAi.java b/forge-ai/src/main/java/forge/ai/ability/AnimateAllAi.java
index 79770568fd3..a1b827ff5d6 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AnimateAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AnimateAllAi.java
@@ -8,12 +8,18 @@ public class AnimateAllAi extends SpellAbilityAi {
 
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {
-        return "Always".equals(sa.getParam("AILogic"));
+        String logic = sa.getParamOrDefault("AILogic", "");
+
+        if ("NeedsCreature".equals(logic)) {
+            return !aiPlayer.getCreaturesInPlay().isEmpty();
+        }
+
+        return "Always".equals(logic);
     } // end animateAllCanPlayAI()
 
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
-        return mandatory;
+        return mandatory || canPlayAI(aiPlayer, sa);
     }
 
 } // end class AbilityFactoryAnimate
diff --git a/forge-gui/res/cardsfolder/o/oko_the_trickster.txt b/forge-gui/res/cardsfolder/o/oko_the_trickster.txt
index 704de78a3e1..cc645af1e10 100644
--- a/forge-gui/res/cardsfolder/o/oko_the_trickster.txt
+++ b/forge-gui/res/cardsfolder/o/oko_the_trickster.txt
@@ -5,6 +5,6 @@ Loyalty:4
 A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Put two +1/+1 counters on up to one target creature you control.
 A:AB$ Clone | Cost$ AddCounter<0/LOYALTY> | ValidTgts$ Creature.YouCtrl | Planeswalker$ True | TgtPrompt$ Select target creature you control | Duration$ UntilEndOfTurn | SubAbility$ DBPrevent | StackDescription$ SpellDescription | SpellDescription$ Until end of turn, CARDNAME becomes a copy of target creature you control. Prevent all damage that would be dealt to him this turn.
 SVar:DBPrevent:DB$ Pump | Defined$ Self | KW$ Prevent all damage that would be dealt to CARDNAME.
-A:AB$ AnimateAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | Power$ 10 | Toughness$ 10 | Keywords$ Trample | SpellDescription$ Until end of turn, each creature you control has base power and toughness 10/10 and gains trample.
+A:AB$ AnimateAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | Power$ 10 | Toughness$ 10 | Keywords$ Trample | AILogic$ NeedsCreature | SpellDescription$ Until end of turn, each creature you control has base power and toughness 10/10 and gains trample.
 DeckHas:Ability$Counters
 Oracle:[+1]: Put two +1/+1 counters on up to one target creature you control.\n[0]: Until end of turn, Oko, the Trickster becomes a copy of target creature you control. Prevent all damage that would be dealt to him this turn.\n[−7]: Until end of turn, each creature you control has base power and toughness 10/10 and gains trample.