diff --git a/plugins/dbgate-plugin-firebird/src/backend/Analyser.js b/plugins/dbgate-plugin-firebird/src/backend/Analyser.js
index a88fe4f76..99ff48fd5 100644
--- a/plugins/dbgate-plugin-firebird/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-firebird/src/backend/Analyser.js
@@ -38,7 +38,9 @@ class Analyser extends DatabaseAnalyser {
     return {
       tables: tables.map(table => ({
         ...table,
-        columns: columns.filter(column => column.tableName === table.pureName),
+        columns: columns.filter(
+          column => column.tableName === table.pureName && column.schemaName === table.schemaName
+        ),
       })),
     };
   }
diff --git a/plugins/dbgate-plugin-firebird/src/backend/sql/tables.js b/plugins/dbgate-plugin-firebird/src/backend/sql/tables.js
index 2cd18e888..ac9f2d533 100644
--- a/plugins/dbgate-plugin-firebird/src/backend/sql/tables.js
+++ b/plugins/dbgate-plugin-firebird/src/backend/sql/tables.js
@@ -2,7 +2,8 @@ module.exports = `
 SELECT
     TRIM(RDB$RELATION_NAME) AS pureName,
     RDB$DESCRIPTION AS objectComment,
-    RDB$FORMAT AS objectTypeField
+    RDB$FORMAT AS objectTypeField,
+    RDB$OWNER_NAME AS schemaName
 FROM RDB$RELATIONS
 WHERE RDB$SYSTEM_FLAG = 0 -- only user-defined tables
 ORDER BY pureName;