diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.js b/public/app/plugins/datasource/elasticsearch/elastic_response.js
index a099aa1a012..4e82a280024 100644
--- a/public/app/plugins/datasource/elasticsearch/elastic_response.js
+++ b/public/app/plugins/datasource/elasticsearch/elastic_response.js
@@ -171,6 +171,9 @@ function (_, queryDef) {
           } else {
             props["filter"] = nameIndex;
           }
+          if (bucket.key_as_string) {
+            props[aggDef.field] = bucket.key_as_string;
+          }
           this.processBuckets(bucket, target, seriesList, docs, props, depth+1);
         }
       }