diff --git a/plugins/dbgate-plugin-postgres/src/backend/drivers.js b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
index de81e3d19..bf75c1518 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/drivers.js
@@ -357,7 +357,7 @@ const drivers = driverBases.map(driverBase => ({
     const [processes, variables, databases] = await Promise.all([
       this.listProcesses(dbhan),
       this.listVariables(dbhan),
-      this.listDatabases(dbhan),
+      this.listDatabasesFull(dbhan),
     ]);
 
     /** @type {import('dbgate-types').ServerSummary} */
@@ -381,11 +381,16 @@ const drivers = driverBases.map(driverBase => ({
     return result;
   },
 
-  async listDatabases(dbhan) {
+  async listDatabasesFull(dbhan) {
     const { rows } = await this.query(dbhan, sql.listDatabases);
     return rows;
   },
 
+  async listDatabases(dbhan) {
+    const { rows } = await this.query(dbhan, 'SELECT datname AS name FROM pg_database WHERE datistemplate = false');
+    return rows;
+  },
+
   async listVariables(dbhan) {
     const result = await this.query(dbhan, sql.listVariables);
     return result.rows.map(row => ({