diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-moria.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-moria.json
index 08e9e5094..973c42f45 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-moria.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-moria.json
@@ -175,9 +175,7 @@
             "type": "chooseYesOrNo",
             "player": "fp",
             "text": "Would you like to skip the Archery phase?",
-            "memorize": "choice",
-            "yes": "yes",
-            "no": "no"
+            "memorize": "choice"
           },
           {
             "type": "conditional",
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java
index 224597350..33c2a00f9 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java
@@ -23,8 +23,8 @@ public class ChooseYesOrNo implements EffectAppenderProducer {
         if (text == null)
             throw new InvalidCardDefinitionException("Text is required for Yes or No decision");
         final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize");
-        final String yesAnswer = FieldUtils.getString(effectObject.get("yes"), "yes");
-        final String noAnswer = FieldUtils.getString(effectObject.get("no"), "no");
+        final String yesAnswer = FieldUtils.getString(effectObject.get("yes"), "yes", "yes");
+        final String noAnswer = FieldUtils.getString(effectObject.get("no"), "no", "no");
         PlayerSource playerSource = PlayerResolver.resolvePlayer(FieldUtils.getString(effectObject.get("player"), "player", "you"), environment);
 
         return new DelayedAppender() {