diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java
index b2980bd15..49aa65dfb 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java
@@ -91,7 +91,6 @@ public class FileExchangeExportService {
     }
 
 
-
     private void addToExportDownloadQueue(ExportDownloadMessage downloadJob) {
 
         rabbitTemplate.convertAndSend(MessagingConfiguration.EXPORT_DOWNLOAD_QUEUE, downloadJob, message -> {
@@ -133,11 +132,10 @@ public class FileExchangeExportService {
 
         List<FileModel> files = fileStatusManagementService.getDossierStatus(dossier.getId());
 
-        if (!request.fileIds().isEmpty() //
-            && !request.dossierIds().isEmpty() //
+        if (!request.dossierIds().contains(dossier.getId()) //
             && files.stream()
-                    .noneMatch(fileModel -> request.fileIds().contains(fileModel.getId()))) {
-            // no files of dossier in requested files and dossier not explicitly requested -> don't export it.
+                    .noneMatch(fileModel -> request.fileIds().isEmpty() || request.fileIds().contains(fileModel.getId()))) {
+            // dossier has no files in requested files and dossier not explicitly requested -> don't export it.
             return;
         }