diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionDictionaryUpdateHandler.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionDictionaryUpdateHandler.java
index 224b3b4e5..945fee559 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionDictionaryUpdateHandler.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionDictionaryUpdateHandler.java
@@ -52,7 +52,7 @@ public class ManualRedactionDictionaryUpdateHandler {
 
     public Set<String> handleAddToDictionaryAndReturnModifiedTypeIds(String fileId, String value, ManualRequestWithAddToDictionary manualRequestWithAddToDictionary) {
 
-        if (!manualRequestWithAddToDictionary.isAddToDictionary()) {
+        if (!manualRequestWithAddToDictionary.isAddToDictionary() || value == null) {
             return Collections.emptySet();
         }
         Set<String> typeIdsOfModifiedDictionaries = new HashSet<>();
@@ -99,7 +99,7 @@ public class ManualRedactionDictionaryUpdateHandler {
 
     public Set<String> handleRemoveFromDictionaryAndReturnModifiedTypeIds(String fileId, ManualRequestWithRemoveFromDictionary manualRequestWithRemoveFromDictionary) {
 
-        if (!manualRequestWithRemoveFromDictionary.isRemoveFromDictionary()) {
+        if (!manualRequestWithRemoveFromDictionary.isRemoveFromDictionary() || manualRequestWithRemoveFromDictionary.getValue() == null) {
             return Collections.emptySet();
         }
         String dossierId = manualRequestWithRemoveFromDictionary.getDossierId();
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
index 587688c1f..447109394 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
@@ -191,13 +191,12 @@ public class ManualRedactionMapper {
                     .addToDictionary(recategorizationRequest.isAddToDictionary())
                     .addToAllDossiers(recategorizationRequest.isAddToAllDossiers())
                     .dictionaryEntryType(getDictionaryEntryType(entityLogEntry))
-                    .value(entityLogEntry.getValue())
+                    .value(recategorizationRequest.getValue())
                     .typeToRemove(entityLogEntry.getType())
                     .dossierTemplateTypeId(toTypeId(recategorizationRequest.getType(), dossierTemplateId))
                     .legalBasis(Optional.ofNullable(recategorizationRequest.getLegalBasis())
                                         .orElse(""))
                     .section(recategorizationRequest.getSection())
-                    .value(recategorizationRequest.getValue())
                     .build();
 
             if (!entityLogEntry.getEngines().contains(Engine.MANUAL) && !recategorizationRequest.isAddToAllDossiers() && !recategorizationRequest.isAddToDictionary()) {
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 c6fd8a3e9..4673e5014 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
@@ -240,6 +240,7 @@ public class ManualRedactionService {
             Set<String> typeIdsOfDictionariesWithAdd = manualRedactionDictionaryUpdateHandler.handleAddToDictionaryAndReturnModifiedTypeIds(fileId,
                                                                                                                                             recategorizationRequest.getValue(),
                                                                                                                                             recategorizationRequest);
+
             Set<String> typeIdsOfDictionariesWithDelete = manualRedactionDictionaryUpdateHandler.handleRemoveFromDictionaryAndReturnModifiedTypeIds(fileId,
                                                                                                                                                     recategorizationRequest);
 
@@ -255,6 +256,7 @@ public class ManualRedactionService {
 
             response.add(ManualAddResponse.builder().annotationId(recategorizationRequest.getAnnotationId()).commentId(commentId).build());
         }
+
         reprocess(dossierId, fileId);
 
         fileStatusPersistenceService.setLastManualChangeDate(fileId, OffsetDateTime.now());