diff --git a/packages/noco-docs/content/en/getting-started/installation.md b/packages/noco-docs/content/en/getting-started/installation.md
index 87f3a2a473..de4c3e7aee 100644
--- a/packages/noco-docs/content/en/getting-started/installation.md
+++ b/packages/noco-docs/content/en/getting-started/installation.md
@@ -151,7 +151,7 @@ And connection params for this database can be specified in `NC_DB` environment
 | AWS_SECRET_ACCESS_KEY | No | For Litestream - S3 secret access key         | If Litestream is configured and NC_DB is not present. SQLite gets backed up to S3  |
 | AWS_BUCKET | No | For Litestream - S3 bucket                              | If Litestream is configured and NC_DB is not present. SQLite gets backed up to S3  |
 | AWS_BUCKET_PATH | No | For Litestream - S3 bucket path (like folder within S3 bucket) | If Litestream is configured and NC_DB is not present. SQLite gets backed up to S3  |
-| NC_EXPORT_MAX_TIMEOUT | No | After NC_EXPORT_MAX_TIMEOUT csv gets downloaded in batches | Default value 5000 will be used  |
+| NC_EXPORT_MAX_TIMEOUT | No | After NC_EXPORT_MAX_TIMEOUT csv gets downloaded in batches | Default value 5000(in millisecond) will be used  |
 
 
 ### Docker Compose
diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
index 246ea5980a..90772d23e6 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
@@ -2525,7 +2525,16 @@ class BaseModelSql extends BaseModel {
       }
     }
 
-    const data = Papaparse.unparse({ fields, data: csvRows });
+    const data = Papaparse.unparse({
+      fields:
+        fields &&
+        fields.filter(
+          f =>
+            this.columns.some(c => c._cn === f) ||
+            this.virtualColumns.some(c => c._cn === f)
+        ),
+      data: csvRows
+    });
     return { data, offset, elapsed };
   }