diff --git a/forge-gui/src/main/java/forge/limited/ThemedChaosDraft.java b/forge-gui/src/main/java/forge/limited/ThemedChaosDraft.java
index ea176616c50..1cf8aedcf30 100644
--- a/forge-gui/src/main/java/forge/limited/ThemedChaosDraft.java
+++ b/forge-gui/src/main/java/forge/limited/ThemedChaosDraft.java
@@ -91,7 +91,7 @@ public class ThemedChaosDraft implements Comparable<ThemedChaosDraft> {
         return new Predicate<CardEdition>() {
             @Override
             public boolean apply(final CardEdition cardEdition){
-                return format.isSetLegal(cardEdition.getCode());
+                return DEFAULT_FILTER.apply(cardEdition) && format.isSetLegal(cardEdition.getCode());
             }
         };
     }