diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
index de0021d2e..45ff37323 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
@@ -70,6 +70,13 @@ public class DownloadController implements DownloadResource {
     public JSONPrimitive<String> prepareDownload(@RequestBody DownloadWithOptionRequest request) {
         var existingFileStatuses = fileStatusPersistenceService.getStatusesForDossier(request.getDossierId());
         var dossier = dossierPersistenceService.getActiveOrArchivedDossier(request.getDossierId());
+        // check reports list and download types
+        if (request.getReportTemplateIds() == null || request.getReportTemplateIds().isEmpty()) {
+            request.setReportTemplateIds(dossier.getReportTemplates().stream().map(ReportTemplateEntity::getTemplateId).collect(Collectors.toList()));
+        }
+        if (request.getDownloadFileTypes() == null || request.getDownloadFileTypes().isEmpty()) {
+            request.setDownloadFileTypes(dossier.getDownloadFileTypes());
+        }
 
         return this.startPrepareDownload(request, dossier, existingFileStatuses);
     }