diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index 59fc5022770..105d2840ea6 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -87,7 +87,7 @@ public class HumanPlayer extends PlayerImpl {
     private static final Logger log = Logger.getLogger(HumanPlayer.class);
 
     static {
-        replacementEffectChoice.setMessage("Choose replacement effect");
+        replacementEffectChoice.setMessage("Choose replacement effect to resolve first");
         staticOptions.put("UI.right.btn.text", "Done");
     }
 
diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java
index b6966eb4b55..4e4c1155b35 100644
--- a/Mage/src/mage/abilities/effects/ContinuousEffects.java
+++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java
@@ -359,6 +359,11 @@ public class ContinuousEffects implements Serializable {
             }
         }
         for (PreventionEffect effect: preventionEffects) {
+            if (event.getAppliedEffects() != null && event.getAppliedEffects().contains(effect.getId())) {
+                // Effect already applied to this event, ignore it
+                // TODO: Handle also gained effect that are connected to different abilities.
+                continue;
+            }            
             HashSet<Ability> abilities = preventionEffects.getAbility(effect.getId());
             HashSet<Ability> applicableAbilities = new HashSet<>();
             for (Ability ability : abilities) {