diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts
index 8143e187b76..68392348f1a 100644
--- a/public/app/plugins/datasource/influxdb/influx_query.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query.ts
@@ -168,6 +168,8 @@ export default class InfluxQuery {
 
     if (!measurement.match('^/.*/')) {
       measurement = '"' + measurement+ '"';
+    } else {
+      measurement = this.templateSrv.replace(measurement, this.scopedVars, 'regex');
     }
 
     if (policy !== 'default') {