diff --git a/plugins/dbgate-plugin-firebird/src/backend/driver.js b/plugins/dbgate-plugin-firebird/src/backend/driver.js
index be411482c..4af3ed392 100644
--- a/plugins/dbgate-plugin-firebird/src/backend/driver.js
+++ b/plugins/dbgate-plugin-firebird/src/backend/driver.js
@@ -144,14 +144,6 @@ const driver = {
     };
   },
 
-  async listDatabases(dbhan) {
-    return [
-      {
-        name: 'default',
-      },
-    ];
-  },
-
   async close(dbhan) {
     return new Promise((resolve, reject) => {
       dbhan.client.detach(err => {
diff --git a/plugins/dbgate-plugin-firebird/src/frontend/driver.js b/plugins/dbgate-plugin-firebird/src/frontend/driver.js
index 598b9bb7b..00512149e 100644
--- a/plugins/dbgate-plugin-firebird/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-firebird/src/frontend/driver.js
@@ -75,13 +75,14 @@ const firebirdDriverBase = {
   defaultPort: 3050,
   showConnectionField: field => ['port', 'user', 'password', 'server', 'databaseFile'].includes(field),
   getQuerySplitterOptions: () => firebirdSplitterOptions,
-  // beforeConnectionSave: connection => {
-  //   const { databaseFile } = connection;
-  //   return {
-  //     singleDatabase: true,
-  //     defaultDatabase: databaseFile,
-  //   };
-  // },
+  beforeConnectionSave: connection => {
+    const { databaseFile } = connection;
+    return {
+      ...connection,
+      singleDatabase: true,
+      defaultDatabase: databaseFile,
+    };
+  },
   engine: 'firebird@dbgate-plugin-firebird',
   title: 'Firebird',
   supportsTransactions: true,