diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java
index a6e5bf0e83f..01ccdba17bc 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java
@@ -45,6 +45,7 @@ public class BoolQueryParser extends AbstractIndexComponent implements XContentQ
 
     @Inject public BoolQueryParser(Index index, @IndexSettings Settings settings) {
         super(index, settings);
+        BooleanQuery.setMaxClauseCount(settings.getAsInt("index.query.bool.max_clause_count", BooleanQuery.getMaxClauseCount()));
     }
 
     @Override public String[] names() {