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 0abf73232..b8c29fe47 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
@@ -130,7 +130,14 @@ public class DownloadPreparationService {
                     .build());
         }
 
-        downloadReportCleanupService.deleteTmpReportFiles(downloadStatus.getGeneratedReportsInformation());
+        downloadReportCleanupService.deleteTmpReportFiles(downloadStatus.getGeneratedReportsInformation()
+                .stream()
+                .map(StoredFileInformation::getStorageId)
+                .collect(Collectors.toSet()));
+        downloadReportCleanupService.deleteTmpReportFiles(reportResultMessage.getRedactionResultDetails()
+                .stream()
+                .map(RedactionResultDetail::getStorageId)
+                .collect(Collectors.toSet()));
     }
 
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java
index 93ceac143..415e4baf5 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java
@@ -6,7 +6,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService;
-import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,11 +18,11 @@ public class DownloadReportCleanupService {
     private final FileManagementStorageService fileManagementStorageService;
 
     @Async
-    public void deleteTmpReportFiles(Collection<StoredFileInformation> fileInformationList) {
+    public void deleteTmpReportFiles(Collection<String> storageIds) {
 
-        for (StoredFileInformation storedFileInformation : fileInformationList) {
-            fileManagementStorageService.deleteObject(storedFileInformation.getStorageId());
-            log.info("Deleted tmp report file {}", storedFileInformation.getStorageId());
+        for (String storageId : storageIds) {
+            fileManagementStorageService.deleteObject(storageId);
+            log.info("Deleted tmp report file {}", storageId);
         }
     }
 }