diff --git a/public/app/plugins/datasource/postgres/meta_query.ts b/public/app/plugins/datasource/postgres/meta_query.ts
index 4f915ef2fef..8bc0e3870c1 100644
--- a/public/app/plugins/datasource/postgres/meta_query.ts
+++ b/public/app/plugins/datasource/postgres/meta_query.ts
@@ -74,8 +74,9 @@ LIMIT 1
   }
 
   buildSchemaConstraint() {
+    // quote_ident protects hyphenated schemes
     const query = `
-table_schema IN (
+quote_ident(table_schema) IN (
   SELECT
     CASE WHEN trim(s[i]) = '"$user"' THEN user ELSE trim(s[i]) END
   FROM