diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index a236fa91b18..a708f384972 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -247,6 +247,7 @@ export default class PostgresQuery {
 
     query += ' ORDER BY 1';
 
+    this.target.rawSql = query;
     if (interpolate) {
       query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
     }
diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts
index b0d5d7ab9ca..4e36e8699ae 100644
--- a/public/app/plugins/datasource/postgres/query_ctrl.ts
+++ b/public/app/plugins/datasource/postgres/query_ctrl.ts
@@ -117,11 +117,6 @@ export class PostgresQueryCtrl extends QueryCtrl {
   }
 
   toggleEditorMode() {
-    try {
-//      this.target.query = this.queryModel.render(false);
-    } catch (err) {
-      console.log('query render error');
-    }
     this.target.rawQuery = !this.target.rawQuery;
   }