diff --git a/config-data-executor/src/main/java/org/micord/service/DownloadService.java b/config-data-executor/src/main/java/org/micord/service/DownloadService.java
index 588d5bd..c31cf6d 100644
--- a/config-data-executor/src/main/java/org/micord/service/DownloadService.java
+++ b/config-data-executor/src/main/java/org/micord/service/DownloadService.java
@@ -115,7 +115,10 @@ public class DownloadService {
 		List<File> allFiles = new ArrayList<>();
 		int offset = 0;
 		int pageIndex = 1;
-		int limit = request.getRequestArgumentLimit();
+		int limit = 600000;
+		if (request.getRequestArgumentLimit() != null) {
+			limit = request.getRequestArgumentLimit();
+		}
 		try (Connection connection = DatabaseConnection.getConnection(
 				request.getSqlConnectionParams())) {
 			Map<String, Object> query = buildSqlQuery(request, ids, startDate, endDate,