diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java
index 2dc4fce91..90fb2a5bf 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DownloadStatusPersistenceService.java
@@ -73,9 +73,11 @@ public class DownloadStatusPersistenceService {
 
 
     @Transactional
-    public void updateStatus(String storageId, DownloadStatusValue status, long fileSize) {
+    public void updateStatus(DownloadStatusEntity entity, DownloadStatusValue statusValue, long fileSize) {
 
-        downloadStatusRepository.updateStatus(storageId, status, fileSize);
+        entity.setStatus(statusValue);
+        entity.setFileSize(fileSize);
+        downloadStatusRepository.save(entity);
     }
 
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java
index a95c7991c..cad2e6787 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DownloadStatusRepository.java
@@ -18,12 +18,7 @@ public interface DownloadStatusRepository extends JpaRepository<DownloadStatusEn
     @Modifying
     @Query("update DownloadStatusEntity ds set ds.status = :status where ds.storageId = :storageId")
     void updateStatus(String storageId, DownloadStatusValue status);
-
-
-    @Modifying
-    @Query("update DownloadStatusEntity ds set ds.status = :status, ds.fileSize = :fileSize where ds.storageId = :storageId")
-    void updateStatus(String storageId, DownloadStatusValue status, long fileSize);
-
+    
 
     @Modifying
     @Query("update DownloadStatusEntity ds set ds.lastDownload = :lastDownload where ds.storageId = :storageId")
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 2f71eb910..24bdad268 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
@@ -163,10 +163,7 @@ public class DownloadPreparationService {
 
     private void updateStatusToReady(DownloadStatusEntity downloadStatus, FileSystemBackedArchiver fileSystemBackedArchiver) {
 
-        downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatusValue.READY, fileSystemBackedArchiver.getContentLength());
-        if (!Objects.equals(downloadStatus.getStatus(), DownloadStatusValue.READY)) {
-            downloadStatus.setStatus(DownloadStatusValue.READY);
-        }
+        downloadStatusPersistenceService.updateStatus(downloadStatus, DownloadStatusValue.READY, fileSystemBackedArchiver.getContentLength());
     }
 
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/export/DossierTemplateExportService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/export/DossierTemplateExportService.java
index 1a797c8bb..da3be619b 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/export/DossierTemplateExportService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/export/DossierTemplateExportService.java
@@ -208,7 +208,7 @@ public class DossierTemplateExportService {
             }
 
             storeZipFile(downloadStatus.getStorageId(), fileSystemBackedArchiver);
-            downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatusValue.READY, fileSystemBackedArchiver.getContentLength());
+            downloadStatusPersistenceService.updateStatus(downloadStatus, DownloadStatusValue.READY, fileSystemBackedArchiver.getContentLength());
 
         } catch (JsonProcessingException e) {
             log.debug("fail ", e);
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 5e8d08880..84ec051a8 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
@@ -25,20 +25,27 @@ import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPers
 import com.iqser.red.service.peristence.v1.server.service.download.DownloadReportMessageReceiver;
 import com.iqser.red.service.peristence.v1.server.service.download.RedactionResultMessageReceiver;
 import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplate;
 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.dossiertemplate.dossier.Dossier;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue;
 import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadWithOptionRequest;
 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.AccessLevel;
 import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
 
 public class DownloadPreparationTest extends AbstractPersistenceServerServiceTest {
 
+    public static final String USER_ID = "1";
     @Autowired
     private DownloadReportMessageReceiver downloadReportMessageReceiver;
 
@@ -81,71 +88,48 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes
     @SneakyThrows
     public void testReceiveDownloadPackage() {
 
-        String userId = "1";
+        var testData = new TestData();
 
-        var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
-
-        var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate);
-
-        var file = fileTesterAndProvider.testAndProvideFile(dossier);
-
-        fileClient.setStatusApproved(dossier.getId(), file.getId(), file.getUploader());
-        var file11 = fileClient.getFileStatus(dossier.getId(), file.getId());
+        fileClient.setStatusApproved(testData.dossier.getId(), testData.file.getId(), testData.file.getUploader());
+        var file11 = fileClient.getFileStatus(testData.dossier.getId(), testData.file.getId());
         assertThat(file11.getWorkflowStatus()).isEqualTo(WorkflowStatus.APPROVED);
 
-        reportTemplateClient.uploadTemplate(ReportTemplateUploadRequest.builder()
-                .activeByDefault(true)
-                .dossierTemplateId(dossierTemplate.getId())
-                .multiFileReport(true)
-                .fileName("test.docx")
-                .template(new byte[]{1, 2, 3, 4})
-                .build());
-
-        var availableTemplates = reportTemplateClient.getAvailableReportTemplates(dossierTemplate.getId());
-        assertThat(availableTemplates).isNotEmpty();
-
-        dossierClient.updateDossier(CreateOrUpdateDossierRequest.builder()
-                .dossierName(dossier.getDossierName())
-                .description(dossier.getDescription())
-                .ownerId(dossier.getOwnerId())
-                .memberIds(dossier.getMemberIds())
-                .approverIds(dossier.getApproverIds())
-                .downloadFileTypes(dossier.getDownloadFileTypes())
-                .watermarkId(dossier.getWatermarkId())
-                .dueDate(dossier.getDueDate())
-                .dossierTemplateId(dossier.getDossierTemplateId())
-                .reportTemplateIds(availableTemplates.stream().map(ReportTemplate::getTemplateId).collect(Collectors.toList()))
-                .build(), dossier.getId());
-
-        var updatedDossier = dossierClient.getDossierById(dossier.getId(), false, false);
+        var updatedDossier = dossierClient.getDossierById(testData.dossier.getId(), false, false);
         assertThat(updatedDossier.getReportTemplateIds()).isNotEmpty();
 
         downloadClient.prepareDownload(DownloadWithOptionRequest.builder()
-                .userId(userId)
-                .dossierId(dossier.getId())
-                .fileIds(Collections.singletonList(file.getId()))
+                .userId(USER_ID)
+                .dossierId(testData.dossier.getId())
+                .fileIds(Collections.singletonList(testData.file.getId()))
                 .redactionPreviewColor("#aaaaaa")
                 .build());
 
-        var statuses = downloadClient.getDownloadStatus(userId);
+        var statuses = downloadClient.getDownloadStatus(USER_ID);
         assertThat(statuses).isNotEmpty();
-        assertThat(statuses.iterator().next().getLastDownload()).isNull();
+        DownloadStatus firstStatus = statuses.get(0);
+        assertThat(firstStatus.getLastDownload()).isNull();
 
-        String downloadId = statuses.iterator().next().getStorageId();
+        String downloadId = firstStatus.getStorageId();
 
-        addStoredFileInformationToStorage(file, availableTemplates, downloadId);
+        addStoredFileInformationToStorage(testData.file, testData.availableTemplates, downloadId);
 
         ReportResultMessage reportResultMessage = new ReportResultMessage();
-        reportResultMessage.setUserId(userId);
+        reportResultMessage.setUserId(USER_ID);
         reportResultMessage.setDownloadId(downloadId);
 
         downloadReportMessageReceiver.receive(reportResultMessage);
 
         redactionResultMessageReceiver.receive(RedactionResultMessage.builder()
                 .downloadId(downloadId)
-                .dossierId(dossier.getId())
+                .dossierId(testData.dossier.getId())
                 .redactionResultDetails(Collections.emptyList())
                 .build());
+
+        List<DownloadStatus> finalDownloadStatuses = downloadClient.getDownloadStatus(USER_ID);
+        assertThat(finalDownloadStatuses).hasSize(1);
+        DownloadStatus finalDownloadStatus = finalDownloadStatuses.get(0);
+        assertThat(finalDownloadStatus.getStatus()).isEqualTo(DownloadStatusValue.READY);
+        assertThat(finalDownloadStatus.getFileSize()).isGreaterThan(0);
     }
 
 
@@ -167,4 +151,46 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes
         storageService.storeObject(reportStorageId, new ByteArrayInputStream(new byte[]{1, 2, 3, 4}));
     }
 
+
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    private class TestData {
+
+        DossierTemplate dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
+
+        Dossier dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate);
+
+        FileModel file = fileTesterAndProvider.testAndProvideFile(dossier);
+
+        List<ReportTemplate> availableTemplates;
+
+
+        private TestData() {
+
+            reportTemplateClient.uploadTemplate(ReportTemplateUploadRequest.builder()
+                    .activeByDefault(true)
+                    .dossierTemplateId(dossierTemplate.getId())
+                    .multiFileReport(true)
+                    .fileName("test.docx")
+                    .template(new byte[]{1, 2, 3, 4})
+                    .build());
+
+            availableTemplates = reportTemplateClient.getAvailableReportTemplates(dossierTemplate.getId());
+            assertThat(availableTemplates).isNotEmpty();
+
+            dossierClient.updateDossier(CreateOrUpdateDossierRequest.builder()
+                    .dossierName(dossier.getDossierName())
+                    .description(dossier.getDescription())
+                    .ownerId(dossier.getOwnerId())
+                    .memberIds(dossier.getMemberIds())
+                    .approverIds(dossier.getApproverIds())
+                    .downloadFileTypes(dossier.getDownloadFileTypes())
+                    .watermarkId(dossier.getWatermarkId())
+                    .dueDate(dossier.getDueDate())
+                    .dossierTemplateId(dossier.getDossierTemplateId())
+                    .reportTemplateIds(availableTemplates.stream().map(ReportTemplate::getTemplateId).collect(Collectors.toList()))
+                    .build(), dossier.getId());
+        }
+
+    }
+
 }