diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index 437a640bfe0..e6c9e781eb3 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -229,6 +229,10 @@ public class EffectEffect extends SpellAbilityEffect {
             eff.copyChangedTextFrom(hostCard);
         }
 
+        if (sa.hasParam("AtEOT")) {
+            registerDelayedTrigger(sa, sa.getParam("AtEOT"), Lists.newArrayList(hostCard));
+        }
+
         // Duration
         final String duration = sa.getParam("Duration");
         if ((duration == null) || !duration.equals("Permanent")) {