diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
index f9a873a25..7db4dd501 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
@@ -86,6 +86,10 @@ public class DownloadController implements DownloadResource {
     @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
     public DownloadResponse prepareDownload(@RequestBody PrepareDownloadRequest request) {
 
+        if (request.getIncludeUnprocessed() == null) {
+            request.setIncludeUnprocessed(true);
+        }
+
         // check the user is non-member or reviewer
         accessControlService.verifyUserIsDossierOwnerOrApprover(request.getDossierId());
         var response = downloadService.prepareDownload(convert(request));
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
index 85beda749..cc08cba8c 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
@@ -71,7 +71,7 @@ public class DownloadPreparationService {
 
 
         downloadStatus.getFiles().forEach(fileEntity -> {
-            RedactionMessage message = messageBuilder.fileId(fileEntity.getId()).unapprovedFile(fileEntity.getWorkflowStatus() != WorkflowStatus.APPROVED).includeUnprocessed(reportResultMessage.isIncludeUnprocessed()).build();
+            RedactionMessage message = messageBuilder.fileId(fileEntity.getId()).unapprovedFile(fileEntity.getWorkflowStatus() != WorkflowStatus.APPROVED).includeUnprocessed(reportResultMessage.getIncludeUnprocessed()).build();
             log.info("Sending redaction request for downloadId:{} fileId:{} to pdftron-redaction-queue", downloadId, fileEntity.getId());
             rabbitTemplate.convertAndSend(MessagingConfiguration.PDFTRON_QUEUE, message);
         });
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
index c5b5c656a..eb94b77be 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
@@ -117,7 +117,7 @@ public class ManualRedactionService {
             log.info("add removeRedaction for file {} and annotation {}", fileId, removeRedactionRequest.getAnnotationId());
             removeRedactionPersistenceService.insert(fileId, removeRedactionRequest);
 
-            if (manualAddRedactionsContains(manualRedactions, removeRedactionRequest.getAnnotationId())) {
+            if (manualAddToDictionaryRedactionsContains(manualRedactions, removeRedactionRequest.getAnnotationId())) {
                 log.info("hard delete ManualRedactions for file {} and annotation {}", fileId, removeRedactionRequest.getAnnotationId());
                 manualRedactionProviderService.hardDeleteManualRedactions(fileId, removeRedactionRequest.getAnnotationId());
                 continue;
@@ -288,9 +288,9 @@ public class ManualRedactionService {
     }
 
 
-    private boolean manualAddRedactionsContains(ManualRedactions manualRedactions, String annotationId) {
+    private boolean manualAddToDictionaryRedactionsContains(ManualRedactions manualRedactions, String annotationId) {
 
-        return manualRedactions.getEntriesToAdd().stream().anyMatch(m -> annotationId.equals(m.getAnnotationId()));
+        return manualRedactions.getEntriesToAdd().stream().anyMatch(m -> annotationId.equals(m.getAnnotationId()) && (m.isAddToDictionary() || m.isAddToDossierDictionary()));
     }
 
 
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 c5d5e3f20..366d4f3a8 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
@@ -140,6 +140,7 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes
         ReportResultMessage reportResultMessage = new ReportResultMessage();
         reportResultMessage.setUserId(USER_ID);
         reportResultMessage.setDownloadId(downloadId);
+        reportResultMessage.setIncludeUnprocessed(true);
         downloadReportMessageReceiver.receive(reportResultMessage);
 
         redactionResultMessageReceiver.receive(RedactionResultMessage.builder()
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
index d57ee8b8f..f02174bdc 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
@@ -1617,7 +1617,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
 
 
     @Test
-    public void testRemoveManualRedactionEntityRemovesAllManualRedactions() {
+    public void testNonDictionaryRemoveManualRedactionEntityDoesNotRemoveAllManualRedactions() {
 
         var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
         var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate);
@@ -1662,11 +1662,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                         .positions(List.of(new Rectangle(new Point(10, 10), 100, 100, 1)))
                         .build()));
         manualRedactionClient.removeRedactionBulk(dossier.getId(), file.getId(), Set.of(RemoveRedactionRequestModel.builder().annotationId(annotationId).build()));
-        assertTrue(manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getEntriesToAdd().isEmpty());
-        assertTrue(manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getLegalBasisChanges().isEmpty());
-        assertTrue(manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getForceRedactions().isEmpty());
-        assertTrue(manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getRecategorizations().isEmpty());
-        assertTrue(manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getResizeRedactions().isEmpty());
+
+        // Only AddToDictionaries will remove all manual redactions.
+        assertEquals(1, manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getEntriesToAdd().size());
+        assertEquals(1, manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getLegalBasisChanges().size());
+        assertEquals(1, manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getForceRedactions().size());
+        assertEquals(1, manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getRecategorizations().size());
+        assertEquals(1, manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getResizeRedactions().size());
         assertEquals(1, manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false).getIdsToRemove().size());
     }
 
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index 7f35315ca..427c4323e 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -34,7 +34,7 @@
         <redaction-service.version>4.165.0</redaction-service.version>
         <search-service.version>2.71.0</search-service.version>
         <pdftron-redaction-service.version>4.38.0</pdftron-redaction-service.version>
-        <redaction-report-service.version>4.31.0</redaction-report-service.version>
+        <redaction-report-service.version>4.33.0</redaction-report-service.version>
         <ocr-service.version>3.10.0</ocr-service.version>
         <storage.commons.version>2.45.0</storage.commons.version>
     </properties>