diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index d53a068812b..0862709438c 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -2958,6 +2958,7 @@ public class CardFactoryUtil {
         final Ability haunterDiesSetup = new Ability(card, ManaCost.ZERO) {
             @Override
             public void resolve() {
+                this.setActivatingPlayer(card.getController());
                 final List<Card> creats = CardLists.filter(Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield), Presets.CREATURES);
                 for (int i = 0; i < creats.size(); i++) {
                     if (!creats.get(i).canBeTargetedBy(this)) {
diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java
index ead6c5bc2a3..434e2ddd5c5 100644
--- a/src/main/java/forge/game/zone/MagicStack.java
+++ b/src/main/java/forge/game/zone/MagicStack.java
@@ -633,6 +633,7 @@ public class MagicStack extends MyObservable {
                 }
             };
             for (int i = 0; i < creats.size(); i++) {
+                haunterDiesWork.setActivatingPlayer(sa.getActivatingPlayer());
                 if (!creats.get(i).canBeTargetedBy(haunterDiesWork)) {
                     creats.remove(i);
                     i--;