diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.js b/public/app/plugins/datasource/elasticsearch/elastic_response.js
index aaac2e46ea1..7eb4378831d 100644
--- a/public/app/plugins/datasource/elasticsearch/elastic_response.js
+++ b/public/app/plugins/datasource/elasticsearch/elastic_response.js
@@ -209,7 +209,7 @@ function (_, queryDef) {
         throw { message: response.error };
       }
 
-      if (response.hits) {
+      if (response.hits && response.hits.hits.length > 0) {
         this.processHits(response.hits, seriesList);
       }