diff --git a/pkg/tsdb/elasticsearch/time_series_query.go b/pkg/tsdb/elasticsearch/time_series_query.go
index 64f6654b32f..a20c827f342 100644
--- a/pkg/tsdb/elasticsearch/time_series_query.go
+++ b/pkg/tsdb/elasticsearch/time_series_query.go
@@ -313,7 +313,7 @@ func (p *timeSeriesQueryParser) parse(tsdbQuery *tsdb.TsdbQuery) ([]*Query, erro
 			return nil, err
 		}
 		alias := model.Get("alias").MustString("")
-		interval := strconv.FormatInt(q.IntervalMs, 10) + "ms"
+		interval := model.Get("interval").MustString("")
 
 		queries = append(queries, &Query{
 			TimeField:  timeField,
diff --git a/pkg/tsdb/elasticsearch/time_series_query_test.go b/pkg/tsdb/elasticsearch/time_series_query_test.go
index d58e83b7e7c..58bb5556060 100644
--- a/pkg/tsdb/elasticsearch/time_series_query_test.go
+++ b/pkg/tsdb/elasticsearch/time_series_query_test.go
@@ -865,6 +865,7 @@ func TestTimeSeriesQueryParser(t *testing.T) {
 				"timeField": "@timestamp",
 				"query": "@metric:cpu",
 				"alias": "{{@hostname}} {{metric}}",
+        "interval": "10m",
 				"metrics": [
 					{
 						"field": "@value",
@@ -921,6 +922,7 @@ func TestTimeSeriesQueryParser(t *testing.T) {
 			So(q.TimeField, ShouldEqual, "@timestamp")
 			So(q.RawQuery, ShouldEqual, "@metric:cpu")
 			So(q.Alias, ShouldEqual, "{{@hostname}} {{metric}}")
+			So(q.Interval, ShouldEqual, "10m")
 
 			So(q.Metrics, ShouldHaveLength, 2)
 			So(q.Metrics[0].Field, ShouldEqual, "@value")