diff --git a/cloud-config-cluster.yml b/cloud-config-cluster.yml
index 0544ef5687..943678b309 100644
--- a/cloud-config-cluster.yml
+++ b/cloud-config-cluster.yml
@@ -272,13 +272,15 @@ write_files:
 
     discovery.ec2.groups: elasticsearch-https, ssh-http-https
 
+    indices.query.bool.max_clause_count: 8192
+
     # discovery.zen.minimum_master_nodes: 2
 
 - path: /etc/elasticsearch/cluster.sh
   content: |
     #!/bin/bash
     name=$1
-    
+
     if [[ -n "$name" ]]; then
         echo "cluster.name: $name" >> /etc/elasticsearch/elasticsearch.yml
     else
diff --git a/cloud-config-elasticsearch.yml b/cloud-config-elasticsearch.yml
index d6f33fbfc9..d2ec37443e 100644
--- a/cloud-config-elasticsearch.yml
+++ b/cloud-config-elasticsearch.yml
@@ -135,13 +135,15 @@ write_files:
 
     discovery.ec2.groups: elasticsearch-https, ssh-http-https
 
+    indices.query.bool.max_clause_count: 8192
+
     # discovery.zen.minimum_master_nodes: 2
 
 - path: /etc/elasticsearch/cluster.sh
   content: |
     #!/bin/bash
     name=$1
-    
+
     if [[ -n "$name" ]]; then
         echo "cluster.name: $name" >> /etc/elasticsearch/elasticsearch.yml
     else
diff --git a/cloud-config.yml b/cloud-config.yml
index 63f2bea6e4..ff7d3c0746 100644
--- a/cloud-config.yml
+++ b/cloud-config.yml
@@ -251,6 +251,8 @@ write_files:
     index.search.slowlog.threshold.fetch.warn: 1s
     index.indexing.slowlog.threshold.index.warn: 25s
 
+    indices.query.bool.max_clause_count: 8192
+
 - path: /etc/postgresql/9.3/main/custom.conf
   content: |
     hot_standby = on