diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2215d0ff660..72211224636 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065)
 * **influxdb**: fix for relative time ranges `last x months` and `last x years`, fixes [#3067](https://github.com/grafana/grafana/issues/3067)
 * **graph**: layout fix for color picker when right side legend was enabled, fixes [#3093](https://github.com/grafana/grafana/issues/3093)
+* **elasticsearch**: disabling elastic query (via eye) caused error, fixes [#3300](https://github.com/grafana/grafana/issues/3300)
 
 # 2.5 (2015-10-28)
 
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index ce370c639d2..9c749b9459e 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -163,11 +163,10 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
       var payload = "";
       var target;
       var sentTargets = [];
-      var headerAdded = false;
 
       for (var i = 0; i < options.targets.length; i++) {
         target = options.targets[i];
-        if (target.hide) {return;}
+        if (target.hide) {continue;}
 
         var queryObj = this.queryBuilder.build(target);
         var esQuery = angular.toJson(queryObj);
@@ -176,12 +175,9 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
         luceneQuery = luceneQuery.substr(1, luceneQuery.length - 2);
         esQuery = esQuery.replace("$lucene_query", luceneQuery);
 
-        if (!headerAdded) {
-          var searchType = queryObj.size === 0 ? 'count' : 'query_then_fetch';
-          var header = this.getQueryHeader(searchType, options.range.from, options.range.to);
-          payload +=  header + '\n';
-          headerAdded = true;
-        }
+        var searchType = queryObj.size === 0 ? 'count' : 'query_then_fetch';
+        var header = this.getQueryHeader(searchType, options.range.from, options.range.to);
+        payload +=  header + '\n';
 
         payload += esQuery + '\n';
         sentTargets.push(target);