diff --git a/prometheus/files/elasticsearch_exporter.cfg b/prometheus/files/elasticsearch_exporter.cfg
index 0f43e20..588a863 100644
--- a/prometheus/files/elasticsearch_exporter.cfg
+++ b/prometheus/files/elasticsearch_exporter.cfg
@@ -4,6 +4,8 @@
 QueryIntervalSecs = {{ elasticsearch_exporter.query_interval|default(15) }}
 QueryTimeoutSecs = {{ elasticsearch_exporter.query_timeout|default(15) }}
 QueryIndices = {{ elasticsearch_exporter.query_indices|default('_all') }}
+QueryOnError = {{ elasticsearch_exporter.query_on_error|default('preserve') }}
+QueryOnMissing = {{ elasticsearch_exporter.query_on_missing|default('zero') }}
 
 {%- for name, query in elasticsearch_exporter.queries.iteritems() | sort %}
   {%- if query.get('enabled', True) %}
@@ -17,6 +19,12 @@
     {%- if query.indices is defined %}
 QueryIndices = {{ query.indices }}
     {%- endif %}
+    {%- if query.on_error is defined %}
+QueryOnError = {{ query.on_error }}
+    {%- endif %}
+    {%- if query.on_missing is defined %}
+QueryOnMissing = {{ query.on_missing }}
+    {%- endif %}
 QueryJson = {{ query.json|json }}
   {%- endif %}
 {%- endfor %}