diff --git a/src/main/java/forge/quest/gui/main/QuestEventManager.java b/src/main/java/forge/quest/gui/main/QuestEventManager.java
index bded697b977..5dfba9801b6 100644
--- a/src/main/java/forge/quest/gui/main/QuestEventManager.java
+++ b/src/main/java/forge/quest/gui/main/QuestEventManager.java
@@ -398,6 +398,8 @@ public class QuestEventManager {
 
             Collections.shuffle(unlockedChallengeIds);
             
+            maxChallenges = Math.min(maxChallenges, unlockedChallengeIds.size());
+            
             for (int i = 0; i < maxChallenges; i++) {
                 availableChallengeIds.add(unlockedChallengeIds.get(i));
             }