diff --git a/res/cardsfolder/h/helm_of_kaldra.txt b/res/cardsfolder/h/helm_of_kaldra.txt
index b97df5f36f2..347b283a735 100644
--- a/res/cardsfolder/h/helm_of_kaldra.txt
+++ b/res/cardsfolder/h/helm_of_kaldra.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Legendary Artifact Equipment
 K:Equip 2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike & Trample & Haste | Description$ Equipped creature has first strike, trample, and haste.
-A:AB$ Token | Cost$ 1 | TokenAmount$ 1 | TokenImage$ C 4 4 Kaldra | TokenName$ Kaldra | TokenTypes$ Legendary,Creature,Avatar | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 4 | TokenToughness$ 4 | SubAbility$ DBAttachEach | RememberTokens$ True | ConditionCheckSVar$ HelmX | ConditionSVarCompare$ EQ2 | SpellDescription$ If you control Equipment named CARDNAME, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it.
+A:AB$ Token | Cost$ 1 | TokenAmount$ 1 | TokenImage$ C 4 4 Kaldra | TokenName$ Kaldra | TokenTypes$ Legendary,Creature,Avatar | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 4 | TokenToughness$ 4 | SubAbility$ DBAttachEach | RememberTokens$ True | ConditionCheckSVar$ HelmX | ConditionSVarCompare$ EQ2 | AILogic$ Never | SpellDescription$ If you control Equipment named CARDNAME, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it.
 SVar:DBAttachEach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.Self,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra | CheckSVar$ HelmY | SVarCompare$ EQ1 | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup
 SVar:DBAttach:DB$ Attach | Object$ Imprinted | Defined$ Remembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/src/main/java/forge/card/ability/ai/AnimateAi.java b/src/main/java/forge/card/ability/ai/AnimateAi.java
index e2e54f5461e..3a57174ef24 100644
--- a/src/main/java/forge/card/ability/ai/AnimateAi.java
+++ b/src/main/java/forge/card/ability/ai/AnimateAi.java
@@ -83,6 +83,8 @@ public class AnimateAi extends SpellAbilityAi {
                     } else {
                         bFlag = true;
                     }
+                } if ("Never".equals(sa.getParam("AILogic"))) {
+                    return false;
                 }
             } else for (final Card c : defined) {
                 bFlag |= !c.isCreature() && !c.isTapped()
diff --git a/src/main/java/forge/card/ability/ai/TokenAi.java b/src/main/java/forge/card/ability/ai/TokenAi.java
index 64a8fe51670..a3bf649a18c 100644
--- a/src/main/java/forge/card/ability/ai/TokenAi.java
+++ b/src/main/java/forge/card/ability/ai/TokenAi.java
@@ -74,6 +74,12 @@ public class TokenAi extends SpellAbilityAi {
             return false;
         }
 
+        if (sa.hasParam("AILogic")) {
+            if ("Never".equals(sa.getParam("AILogic"))) {
+                return false;
+            }
+        }
+
         Player opp = ai.getOpponent();
         for (final String type : this.tokenTypes) {
             if (type.equals("Legendary")) {