diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index c9ac7d3ff..ecd41610f 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -622,20 +622,23 @@ module.exports = {
     { conid, database, outputFile, inputFile, options, selectedTables, skippedTables, argsFormat }
   ) {
     const sourceConnection = await connections.getCore({ conid });
-    let connection = decryptConnection(sourceConnection);
+    const connection = {
+      ...decryptConnection(sourceConnection),
+    };
     const driver = requireEngineDriver(connection);
 
+    if (!connection.port && driver.defaultPort) {
+      connection.port = driver.defaultPort.toString();
+    }
+
     if (connection.useSshTunnel) {
       const tunnel = await getSshTunnel(connection);
       if (tunnel.state == 'error') {
         throw new Error(tunnel.message);
       }
 
-      connection = {
-        ...connection,
-        server: tunnel.localHost,
-        port: tunnel.localPort,
-      }
+      connection.server = tunnel.localHost;
+      connection.port = tunnel.localPort;
     }
 
     const settingsValue = await config.getSettings();
diff --git a/packages/api/src/utility/connectUtility.js b/packages/api/src/utility/connectUtility.js
index 757df2a6e..4a56c98d7 100644
--- a/packages/api/src/utility/connectUtility.js
+++ b/packages/api/src/utility/connectUtility.js
@@ -96,7 +96,9 @@ async function connectUtility(driver, storedConnection, connectionMode, addition
     ...decryptConnection(connectionLoaded),
   };
 
-  if (!connection.port && driver.defaultPort) connection.port = driver.defaultPort.toString();
+  if (!connection.port && driver.defaultPort) {
+    connection.port = driver.defaultPort.toString();
+  }
 
   if (connection.useSshTunnel) {
     const tunnel = await getSshTunnelProxy(connection);