diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
index be30ef0b9..daa14f42f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierPersistenceService.java
@@ -52,7 +52,9 @@ public class DossierPersistenceService {
         dossierRepository.findById(dossierId).ifPresent(dossier -> {
             BeanUtils.copyProperties(createOrUpdateDossierRequest, dossier);
             dossier.setDossierTemplate(dossierTemplateRepository.getOne(createOrUpdateDossierRequest.getDossierTemplateId()));
-            dossier.setReportTemplates(reportTemplateRepository.findAllById(createOrUpdateDossierRequest.getReportTemplateIds()));
+            var reportTemplates = reportTemplateRepository.findAllById(createOrUpdateDossierRequest.getReportTemplateIds());
+            reportTemplates.forEach(r -> r.getDossiers().add(dossier));
+            dossier.setReportTemplates(reportTemplates);
         });
 
     }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
index c3115b21c..2354a7f31 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
@@ -109,6 +109,7 @@ public class DownloadPreparationService {
     private void addReports(ReportResultMessage reportResultMessage, FileSystemBackedArchiver fileSystemBackedArchiver) {
 
         long addReportsStart = System.currentTimeMillis();
+        
         for (StoredFileInformation storedFileInformation : reportResultMessage.getStoredFileInformation()) {
 
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java
index 50fadd89c..33e12a7fb 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java
@@ -1,6 +1,7 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.DownloadClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.ReportTemplateClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider;
@@ -8,18 +9,27 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
 import com.iqser.red.service.peristence.v1.server.service.download.DownloadReportMessageReceiver;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUploadRequest;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadRequest;
 import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage;
 import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation;
 import com.iqser.red.storage.commons.service.StorageService;
+
+import lombok.Builder;
 import lombok.SneakyThrows;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.ByteArrayInputStream;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -49,6 +59,9 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes
     @Autowired
     private ReportTemplateClient reportTemplateClient;
 
+    @Autowired
+    private DossierClient dossierClient;
+
 
     @Test
     @SneakyThrows
@@ -71,6 +84,23 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes
         assertThat(availableTemplates).isNotEmpty();
 
 
+        dossierClient.updateDossier(CreateOrUpdateDossierRequest.builder()
+                .dossierName(dossier.getDossierName())
+                .date(dossier.getDate())
+                .description(dossier.getDescription())
+                .ownerId(dossier.getOwnerId())
+                .memberIds(dossier.getMemberIds())
+                .approverIds(dossier.getApproverIds())
+                .downloadFileTypes(dossier.getDownloadFileTypes())
+                .watermarkEnabled(dossier.isWatermarkEnabled())
+                .dueDate(dossier.getDueDate())
+                .dossierTemplateId(dossier.getDossierTemplateId())
+                .reportTemplateIds(availableTemplates.stream().map(a -> a.getTemplateId()).collect(Collectors.toList()))
+                .build(), dossier.getId());
+
+        var updatedDossier = dossierClient.getDossierById(dossier.getId());
+        assertThat(updatedDossier.getReportTemplateIds()).isNotEmpty();
+
         downloadClient.prepareDownload(DownloadRequest.builder()
                 .userId("1")
                 .dossierId(dossier.getId())