diff --git a/shared-code/src/data-access-layer/data-access-objects/data-access-object-mssql.ts b/shared-code/src/data-access-layer/data-access-objects/data-access-object-mssql.ts
index ad60acb8c..fa1d4663f 100644
--- a/shared-code/src/data-access-layer/data-access-objects/data-access-object-mssql.ts
+++ b/shared-code/src/data-access-layer/data-access-objects/data-access-object-mssql.ts
@@ -529,17 +529,16 @@ WHERE TABLE_TYPE = 'VIEW'
           : DAO_CONSTANTS.DEFAULT_PAGINATION.perPage;
 
     const knex = await this.configureKnex();
-    const [rowsCount, tableStructure, tableSchema] = await Promise.all([
-      this.getRowsCount(tableName, null),
+    const [tableStructure, tableSchema] = await Promise.all([
       this.getTableStructure(tableName),
       this.getSchemaName(tableName),
     ]);
 
     const availableFields = this.findAvailableFields(tableSettings, tableStructure);
 
-    if (rowsCount >= DAO_CONSTANTS.LARGE_DATASET_ROW_LIMIT) {
-      throw new Error(ERROR_MESSAGES.DATA_IS_TO_LARGE);
-    }
+    // if (rowsCount >= DAO_CONSTANTS.LARGE_DATASET_ROW_LIMIT) {
+    //   throw new Error(ERROR_MESSAGES.DATA_IS_TO_LARGE);
+    // }
 
     if (tableSchema) {
       tableName = `${tableSchema}.[${tableName}]`;
diff --git a/shared-code/src/data-access-layer/data-access-objects/data-access-object-mysql.ts b/shared-code/src/data-access-layer/data-access-objects/data-access-object-mysql.ts
index ab2e79c6d..28e33de49 100644
--- a/shared-code/src/data-access-layer/data-access-objects/data-access-object-mysql.ts
+++ b/shared-code/src/data-access-layer/data-access-objects/data-access-object-mysql.ts
@@ -588,14 +588,16 @@ export class DataAccessObjectMysql extends BasicDataAccessObject implements IDat
     const offset = (page - 1) * perPage;
     const knex = await this.configureKnex();
 
-    const [{ large_dataset }, tableStructure] = await Promise.all([
-      this.getRowsCount(knex, null, tableName, this.connection.database),
-      this.getTableStructure(tableName),
-    ]);
+    // const [{ large_dataset }, tableStructure] = await Promise.all([
+    //   this.getRowsCount(knex, null, tableName, this.connection.database),
+    //   this.getTableStructure(tableName),
+    // ]);
 
-    if (large_dataset) {
-      throw new Error(ERROR_MESSAGES.DATA_IS_TO_LARGE);
-    }
+    const tableStructure = await this.getTableStructure(tableName);
+
+    // if (large_dataset) {
+    //   throw new Error(ERROR_MESSAGES.DATA_IS_TO_LARGE);
+    // }
 
     const availableFields = this.findAvailableFields(settings, tableStructure);
 
diff --git a/shared-code/src/data-access-layer/data-access-objects/data-access-object-postgres.ts b/shared-code/src/data-access-layer/data-access-objects/data-access-object-postgres.ts
index c8b480974..1d6af3aa7 100644
--- a/shared-code/src/data-access-layer/data-access-objects/data-access-object-postgres.ts
+++ b/shared-code/src/data-access-layer/data-access-objects/data-access-object-postgres.ts
@@ -590,16 +590,19 @@ export class DataAccessObjectPostgres extends BasicDataAccessObject implements I
     const offset = (page - 1) * perPage;
     const knex = await this.configureKnex();
 
-    const tableSchema = this.connection.schema ?? 'public';
-    const [{ large_dataset }, tableStructure] = await Promise.all([
-      this.getRowsCount(knex, null, tableName, tableSchema),
-      this.getTableStructure(tableName),
-    ]);
+    // const tableSchema = this.connection.schema ?? 'public';
+
+    // const [{ large_dataset }, tableStructure] = await Promise.all([
+    //   this.getRowsCount(knex, null, tableName, tableSchema),
+    //   this.getTableStructure(tableName),
+    // ]);
+
+    const tableStructure = await this.getTableStructure(tableName);
     const availableFields = this.findAvailableFields(settings, tableStructure);
 
-    if (large_dataset) {
-      throw new Error(ERROR_MESSAGES.DATA_IS_TO_LARGE);
-    }
+    // if (large_dataset) {
+    //   throw new Error(ERROR_MESSAGES.DATA_IS_TO_LARGE);
+    // }
     const rowsAsStream = knex(tableName)
       .withSchema(this.connection.schema ?? 'public')
       .select(availableFields)