diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
index 1f88073cc..61315e585 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
@@ -1,23 +1,5 @@
 package com.iqser.red.service.peristence.v1.server.service;
 
-import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
-import static com.iqser.red.service.persistence.management.v1.processor.utils.TypeIdUtils.toTypeId;
-
-import java.nio.charset.StandardCharsets;
-import java.time.OffsetDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.transaction.Transactional;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.hash.HashFunction;
@@ -25,14 +7,7 @@ import com.google.common.hash.Hashing;
 import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration;
 import com.iqser.red.service.peristence.v1.server.controller.DictionaryController;
 import com.iqser.red.service.peristence.v1.server.utils.ManualRedactionMapper;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.CommentEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.IdRemovalEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualForceRedactionEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualImageRecategorizationEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualLegalBasisChangeEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualResizeRedactionEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.*;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
@@ -41,23 +16,8 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierTemplatePersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.AddRedactionPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.CommentPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ForceRedactionPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ImageRecategorizationPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.LegalBasisChangePersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.RemoveRedactionPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ResizeRedactionPersistenceService;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualAddResponse;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ResizeRedactionRequest;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.*;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
@@ -66,10 +26,21 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.MessageType;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.TypeIdUtils.toTypeId;
 
 @Slf4j
 @Service
@@ -177,10 +148,11 @@ public class ManualRedactionService {
 
     public List<ManualAddResponse> addRemoveRedaction(String dossierId, String fileId, List<RemoveRedactionRequest> removeRedactionRequests) {
 
+        RedactionLog redactionLog = null;
+
         var response = new ArrayList<ManualAddResponse>();
         var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
         var actionPerformed = false;
-        var redactionLog = fileManagementStorageService.getRedactionLog(dossier.getId(), fileId);
         var manualRedactions = manualRedactionProviderService.getManualRedactions(fileId);
 
         for (var removeRedactionRequest : removeRedactionRequests) {
@@ -188,12 +160,15 @@ public class ManualRedactionService {
             if (manualAddRedactionsContains(manualRedactions, removeRedactionRequest.getAnnotationId()) && AnnotationStatus.APPROVED.equals(removeRedactionRequest.getStatus())) {
                 log.info("hard delete ManualRedactions for file {} and annotation {}", fileId, removeRedactionRequest.getAnnotationId());
                 manualRedactionProviderService.hardDeleteManualRedactions(fileId, removeRedactionRequest.getAnnotationId());
-                actionPerformed = true;
             } else {
 
                 log.info("add removeRedaction for file {} and annotation {}", fileId, removeRedactionRequest.getAnnotationId());
                 removeRedactionPersistenceService.insert(fileId, removeRedactionRequest);
 
+                if (redactionLog == null) {
+                    redactionLog = fileManagementStorageService.getRedactionLog(dossier.getId(), fileId);
+                }
+
                 Long commentId = null;
                 if (removeRedactionRequest.getComment() != null) {
                     commentId = addComment(fileId, removeRedactionRequest.getAnnotationId(), removeRedactionRequest.getComment(), removeRedactionRequest.getUser()).getId();