diff --git a/forge-game/src/main/java/forge/game/ForgeScript.java b/forge-game/src/main/java/forge/game/ForgeScript.java
index a1b683a14ec..0e1a178063b 100644
--- a/forge-game/src/main/java/forge/game/ForgeScript.java
+++ b/forge-game/src/main/java/forge/game/ForgeScript.java
@@ -116,8 +116,13 @@ public class ForgeScript {
             }
             for (final Trigger trig : cardState.getTriggers()) {
                 SpellAbility sa = trig.getOverridingAbility();
-                if (sa != null && sa.isManaAbility()) {
-                    return true;
+                if (sa != null) {
+                    if (!sa.isTrigger()) {
+                        sa.setTrigger(trig);
+                    }
+                    if (sa.isManaAbility()) {
+                        return true;
+                    }
                 }
             }
             return false;
diff --git a/forge-game/src/main/java/forge/game/TriggerReplacementBase.java b/forge-game/src/main/java/forge/game/TriggerReplacementBase.java
index 2b89bdd01be..cb1afc25d70 100644
--- a/forge-game/src/main/java/forge/game/TriggerReplacementBase.java
+++ b/forge-game/src/main/java/forge/game/TriggerReplacementBase.java
@@ -64,9 +64,6 @@ public abstract class TriggerReplacementBase extends CardTraitBase implements II
      * @return the overridingAbility
      */
     public SpellAbility getOverridingAbility() {
-        if (overridingAbility != null && !overridingAbility.isTrigger() && this instanceof Trigger) {
-            overridingAbility.setTrigger((Trigger) this);
-        }
         return this.overridingAbility;
     }