diff --git a/public/app/plugins/datasource/postgres/query_builder.ts b/public/app/plugins/datasource/postgres/query_builder.ts
index 3dfbf99fefd..dd6f95b550c 100644
--- a/public/app/plugins/datasource/postgres/query_builder.ts
+++ b/public/app/plugins/datasource/postgres/query_builder.ts
@@ -39,7 +39,7 @@ export class PostgresQueryBuilder {
   }
 
   buildValueQuery(column: string) {
-    var query = "SELECT DISTINCT quote_literal(" + column + ")";
+    var query = "SELECT DISTINCT quote_literal(" + this.queryModel.quoteIdentifier(column) + ")";
     query += " FROM " + this.queryModel.quoteIdentifier(this.target.schema);
     query += "." + this.queryModel.quoteIdentifier(this.target.table);
     query += " ORDER BY 1 LIMIT 100";