diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
index 9c7391c914e..ccf5184c8d4 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
@@ -32,6 +32,12 @@ public class ChooseGenericEffect extends SpellAbilityEffect {
         final Card host = sa.getHostCard();
 
         final List<SpellAbility> abilities = Lists.newArrayList(sa.getAdditionalAbilityList("Choices"));
+        if (sa.hasParam("NumRandomChoices")) {
+            int n = AbilityUtils.calculateAmount(host, sa.getParam("NumRandomChoices"), sa);
+            while (abilities.size() > n) {
+                Aggregates.removeRandom(abilities);
+            }
+        }
         final SpellAbility fallback = sa.getAdditionalAbility("FallbackAbility");
         final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("ChoiceAmount", "1"), sa);