diff --git a/packages/api/src/utility/connectUtility.js b/packages/api/src/utility/connectUtility.js
index c11d4d99f..48ff303c6 100644
--- a/packages/api/src/utility/connectUtility.js
+++ b/packages/api/src/utility/connectUtility.js
@@ -9,6 +9,9 @@ async function connectUtility(driver, storedConnection) {
   const connection = {
     ...decryptConnection(storedConnection),
   };
+
+  if (!connection.port && driver.defaultPort) connection.port = driver.defaultPort.toString();
+
   if (connection.useSshTunnel) {
     const tunnel = await getSshTunnelProxy(connection);
     if (tunnel.state == 'error') {
@@ -19,8 +22,6 @@ async function connectUtility(driver, storedConnection) {
     connection.port = tunnel.localPort;
   }
 
-  if (!connection.port && driver.defaultPort) connection.port = driver.defaultPort.toString();
-
   // SSL functionality - copied from https://github.com/beekeeper-studio/beekeeper-studio
   if (connection.useSsl) {
     connection.ssl = {};