diff --git a/common/content/world_content_service.h b/common/content/world_content_service.h
index bfed118c9..89abba257 100644
--- a/common/content/world_content_service.h
+++ b/common/content/world_content_service.h
@@ -25,7 +25,8 @@
 #include <vector>
 
 namespace Expansion {
-	static const int EXPANSION_ALL = -1;
+	static const int EXPANSION_ALL        = -1;
+	static const int EXPANSION_FILTER_MAX = 99;
 
 	enum ExpansionNumber {
 		Classic = 0,
diff --git a/common/repositories/criteria/content_filter_criteria.h b/common/repositories/criteria/content_filter_criteria.h
index 1fd5f2267..5a0770fe5 100644
--- a/common/repositories/criteria/content_filter_criteria.h
+++ b/common/repositories/criteria/content_filter_criteria.h
@@ -34,17 +34,22 @@ namespace ContentFilterCriteria {
 			table_prefix = table_prefix + ".";
 		}
 
+		int current_expansion_filter_criteria = content_service.GetCurrentExpansion();
+		if (current_expansion_filter_criteria == Expansion::EXPANSION_ALL) {
+			current_expansion_filter_criteria = Expansion::EXPANSION_FILTER_MAX;
+		}
+
 		criteria += fmt::format(
 			" AND ({}min_expansion <= {} OR {}min_expansion = 0)",
 			table_prefix,
-			content_service.GetCurrentExpansion(),
+			current_expansion_filter_criteria,
 			table_prefix
 		);
 
 		criteria += fmt::format(
 			" AND ({}max_expansion >= {} OR {}max_expansion = 0)",
 			table_prefix,
-			content_service.GetCurrentExpansion(),
+			current_expansion_filter_criteria,
 			table_prefix
 		);