diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 08f42f2cf50..02511f4900b 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -331,6 +331,9 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
     this.metricFindQuery = function(query) {
       query = angular.fromJson(query);
       query.query = templateSrv.replace(query.query || '*', {}, 'lucene');
+      if ('field' in query) {
+        query.field = templateSrv.replace(query.field, {}, 'lucene');
+      }
 
       if (!query) {
         return $q.when([]);