diff --git a/public/app/core/services/segment_srv.js b/public/app/core/services/segment_srv.js
index 6c126da1acd..71d0cbfe7a9 100644
--- a/public/app/core/services/segment_srv.js
+++ b/public/app/core/services/segment_srv.js
@@ -89,7 +89,7 @@ function (angular, _, coreModule) {
         if (addTemplateVars) {
           _.each(templateSrv.variables, function(variable) {
             if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) {
-              segments.unshift(self.newSegment({ type: 'template', value: '$' + variable.name, expandable: true }));
+              segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true }));
             }
           });
         }
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index c67b65334af..ce669c9f458 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -255,7 +255,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
         for (let variable of this.templateSrv.variables) {
           segments.unshift(
             this.uiSegmentSrv.newSegment({
-              type: 'template',
+              type: 'value',
               value: '/^$' + variable.name + '$/',
               expandable: true,
             })