diff --git a/src/main/java/forge/card/ability/effects/ManaEffect.java b/src/main/java/forge/card/ability/effects/ManaEffect.java
index d75a2ccebfc..a9ed652436d 100644
--- a/src/main/java/forge/card/ability/effects/ManaEffect.java
+++ b/src/main/java/forge/card/ability/effects/ManaEffect.java
@@ -137,12 +137,15 @@ public class ManaEffect extends SpellAbilityEffect {
                         abMana.setExpressChoice(choice);
                     }
                     else {
-                        if (sa.hasParam("AILogic")) {
-                            final String logic = sa.getParam("AILogic");
+                        if (abMana.getExpressChoice().isEmpty()) {
+                            final String logic = sa.hasParam("AILogic") ? sa.getParam("AILogic") : null;
                             String chosen = Constant.Color.BLACK;
-                            if (logic.equals("MostProminentInComputerHand")) {
+                            if (logic == null || logic.equals("MostProminentInComputerHand")) {
                                 chosen = ComputerUtilCard.getMostProminentColor(act.getCardsIn(ZoneType.Hand));
                             }
+                            if (chosen.equals("")) {
+                                chosen = Constant.Color.GREEN;
+                            }
                             GuiChoose.one("Computer picked: ", new String[]{chosen});
                             abMana.setExpressChoice(MagicColor.toShortString(chosen));
                         }