diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 6e9860a20d2..aeffcb96488 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -671,6 +671,10 @@ public abstract class SpellAbilityEffect {
                 if (card == null) { continue; }
                 if (p.discard(card, sa, table) != null) {
                     discardedByPlayer.add(card);
+
+                    if (sa.hasParam("RememberDiscarded")) {
+                        sa.getHostCard().addRemembered(card);
+                    }
                 }
             }
             discardedMap.put(p, discardedByPlayer);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
index 99af3c9608a..6a0318d5b48 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
@@ -291,10 +291,6 @@ public class DiscardEffect extends SpellAbilityEffect {
 
         discard(sa, table, discardedMap);
 
-        if (sa.hasParam("RememberDiscarded")) {
-            source.addRemembered(discardedMap.values());
-        }
-
         // run trigger if something got milled
         table.triggerChangesZoneAll(game);
     } // discardResolve()