diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 964d48d7826..4c34dc53f53 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -179,6 +179,7 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
           ...query,
           datasource: this.name,
           measurement: this.templateSrv.replace(query.measurement, scopedVars, 'regex'),
+          policy: this.templateSrv.replace(query.policy, scopedVars, 'regex'),
         };
 
         if (query.rawQuery) {