diff --git a/packages/nocodb/src/db/sql-client/lib/mssql/MssqlClient.ts b/packages/nocodb/src/db/sql-client/lib/mssql/MssqlClient.ts
index 9df83f88f2..6e08545867 100644
--- a/packages/nocodb/src/db/sql-client/lib/mssql/MssqlClient.ts
+++ b/packages/nocodb/src/db/sql-client/lib/mssql/MssqlClient.ts
@@ -1118,8 +1118,9 @@ class MssqlClient extends KnexClient {
       args.databaseName = this.connectionConfig.connection.database;
 
       const response = await this.sqlClient.raw(
-        `SELECT v.name AS view_name,v.*,m.* FROM sys.views v INNER JOIN sys.schemas s ON s.schema_id = v.schema_id
+        `SELECT v.name AS view_name,v.*,m.* FROM sys.views v INNER JOIN sys.schemas s ON s.schema_id = v.schema_id AND schema_name(v.schema_id) = ?
         INNER JOIN sys.sql_modules AS m ON m.object_id = v.object_id`,
+        [this.schema || 'dbo'],
       );
 
       result.data.list = response;
diff --git a/packages/nocodb/src/db/sql-client/lib/pg/PgClient.ts b/packages/nocodb/src/db/sql-client/lib/pg/PgClient.ts
index 06db320e25..9d6623dfa2 100644
--- a/packages/nocodb/src/db/sql-client/lib/pg/PgClient.ts
+++ b/packages/nocodb/src/db/sql-client/lib/pg/PgClient.ts
@@ -1350,7 +1350,8 @@ class PGClient extends KnexClient {
       const { rows } = await this.sqlClient.raw(
         `select *
            from INFORMATION_SCHEMA.views
-           WHERE table_schema = ANY (current_schemas(false));`,
+           WHERE table_schema = ?;`,
+        [this.schema],
       );
 
       for (let i = 0; i < rows.length; ++i) {