diff --git a/res/cardsfolder/p/predatory_nightstalker.txt b/res/cardsfolder/p/predatory_nightstalker.txt
index a635fd5069f..a13edc21809 100644
--- a/res/cardsfolder/p/predatory_nightstalker.txt
+++ b/res/cardsfolder/p/predatory_nightstalker.txt
@@ -4,6 +4,7 @@ Types:Creature Nightstalker
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigSac | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may have target opponent sacrifice a creature.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | ValidTgts$ Opponent | SacValid$ Creature
+SVar:PlayMain1:TRUE
 SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/predatory_nightstalker.jpg
 Oracle:When Predatory Nightstalker enters the battlefield, you may have target opponent sacrifice a creature.
 SetInfo:PO2 Uncommon
\ No newline at end of file
diff --git a/src/main/java/forge/card/trigger/WrappedAbility.java b/src/main/java/forge/card/trigger/WrappedAbility.java
index 5a083f67b32..59124523914 100644
--- a/src/main/java/forge/card/trigger/WrappedAbility.java
+++ b/src/main/java/forge/card/trigger/WrappedAbility.java
@@ -411,6 +411,10 @@ public class WrappedAbility extends Ability implements ISpellAbility {
                 // There is no way this doTrigger here will have the same target as stored above
                 // So it's possible it's making a different decision here than will actually happen
                 if (!sa.doTrigger(this.isMandatory(), decider)) {
+                    if (storeChoices) {
+                        tgt.resetTargets();
+                        tgt.setTargetChoices(tc);
+                    }
                     return false;
                 }
                 if (storeChoices) {