diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
index 323f2ae32..35f91e422 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
@@ -57,11 +57,11 @@ class Analyser extends DatabaseAnalyser {
 
   createQuery(resFileName, typeFields, replacements = {}) {
     const query = super.createQuery(sql[resFileName], typeFields, replacements);
-    // const dbname = this.pool.__database_name__;
-    // const schemaCondition = isCompositeDbName(dbname)
-    //   ? `= '${splitCompositeDbName(dbname).schema}' `
-    //   : ' IS NOT NULL   ';
-    const schemaCondition = ' IS NOT NULL   ';
+    const dbname = this.pool.__database_name__;
+    const schemaCondition = isCompositeDbName(dbname)
+      ? `= '${splitCompositeDbName(dbname).schema}' `
+      : ' IS NOT NULL   ';
+    // const schemaCondition = ' IS NOT NULL   ';
 
     return query?.replace(/=SCHEMA_NAME_CONDITION/g, schemaCondition);
   }