diff --git a/packages/nocodb/docker-compose.yml b/packages/nocodb/docker-compose.yml
index 05316b654b..6ae39e6cca 100644
--- a/packages/nocodb/docker-compose.yml
+++ b/packages/nocodb/docker-compose.yml
@@ -139,7 +139,7 @@ services:
     #     - ./sqlite-sakila-db:/root/db/
     #     # - ./sqlite-sakila-db:/root/db/
     mssql:
-     image: microsoft/mssql-server-linux:latest
+     image: mcr.microsoft.com/mssql/server:2019-CU11-ubuntu-20.04
      # restart: always
      environment:
        ACCEPT_EULA: Y
diff --git a/packages/nocodb/src/lib/noco/common/NcConnectionMgr.ts b/packages/nocodb/src/lib/noco/common/NcConnectionMgr.ts
index d0e98b5e7c..8a082c01f1 100644
--- a/packages/nocodb/src/lib/noco/common/NcConnectionMgr.ts
+++ b/packages/nocodb/src/lib/noco/common/NcConnectionMgr.ts
@@ -60,7 +60,11 @@ export default class NcConnectionMgr {
         }
       }
 
-      const isSqlite = connectionConfig.client === 'sqlite3';
+      const isSqlite = connectionConfig?.client === 'sqlite3';
+
+      if (connectionConfig?.connection?.port) {
+        connectionConfig.connection.port = +connectionConfig.connection.port
+      }
 
       this.connectionRefs[projectId][env][dbAlias] = XKnex(isSqlite ?
         connectionConfig.connection as Knex.Config :