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 09cdb8e02a8..a8122e52b4f 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
@@ -341,8 +341,18 @@ public class HumanPlayer extends PlayerImpl {
 
         replacementEffectChoice.getChoices().clear();
         replacementEffectChoice.setKeyChoices(rEffects);
+        
+        // Check if there are different ones
+        int differentChoices = 0;
+        String lastChoice = "";
+        for (String value : replacementEffectChoice.getKeyChoices().values()) {
+            if (!lastChoice.equalsIgnoreCase(value)) {
+                lastChoice = value;
+                differentChoices++;
+            }
+        }
 
-        while (!abort) {
+        while (!abort && differentChoices > 1) {
             updateGameStatePriority("chooseEffect", game);
             prepareForResponse(game);
             if (!isExecutingMacro()) {