diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index 78e9c9c1a3f..2f8b3911ebc 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -239,6 +239,9 @@ export default class PostgresQuery {
 
     query += ' ORDER BY time';
 
+    if (interpolate) {
+      query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
+    }
     return query;
   }
 
diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts
index 0c30e2c51ff..bde4010e226 100644
--- a/public/app/plugins/datasource/postgres/query_ctrl.ts
+++ b/public/app/plugins/datasource/postgres/query_ctrl.ts
@@ -207,7 +207,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
           segments.unshift(
             this.uiSegmentSrv.newSegment({
               type: 'template',
-              value: '/^$' + variable.name + '$/',
+              value: '$' + variable.name,
               expandable: true,
             })
           );