diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index ef903ea3259..b8d3d107bb6 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -149,7 +149,7 @@ export default class PostgresQuery {
   render(interpolate?) {
     var target = this.target;
 
-    if (target.rawQuery) {
+    if (target.rawQuery || !('rawQuery' in target)) {
       if (interpolate) {
         return this.templateSrv.replace(target.rawSql, this.scopedVars, this.interpolateQueryStr);
       } else {