diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java
index c7f1cf1ef..aa6cb1db8 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusProcessingUpdateService.java
@@ -37,8 +37,8 @@ public class FileStatusProcessingUpdateService {
                 if (settings.isNerServiceEnabled() && !fileManagementStorageService.nerEntitiesExists(dossierId, fileId)) {
                     fileStatusService.addToNerQueue(dossierId, fileId);
                 } else {
-                    analyzeResult.setMessageType(MessageType.ANALYSE);
-                    analysisSuccessful(dossierId, fileId, analyzeResult);
+                    fileStatusService.setStatusAnalyse(dossierId, fileId, 1);
+                    fileStatusService.addToAnalysisQueue(dossierId, fileId, 2, null);
                 }
                 break;
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
index ebfd1dc97..c8752ace3 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
@@ -95,6 +95,7 @@ public class FileStatusService {
     }
 
 
+
     public void setStatusProcessing(String fileId) {
 
         fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.PROCESSING);
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 c9149111a..c16cf3164 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
@@ -614,10 +614,18 @@ public class ManualRedactionService {
     public void updateProcessedDate(String fileId, ManualRedactions manualRedactions) {
 
         // These are marked as processed once analysis completes, not when they are set as approved
-        manualRedactions.getIdsToRemove().forEach(removeRedactionPersistenceService::markAsProcessed);
-        manualRedactions.getForceRedactions().forEach(forceRedactionPersistenceService::markAsProcessed);
-        manualRedactions.getImageRecategorization().forEach(recategorizationPersistenceService::markAsProcessed);
+        if(manualRedactions != null) {
 
+            if(manualRedactions.getIdsToRemove() != null) {
+                manualRedactions.getIdsToRemove().forEach(removeRedactionPersistenceService::markAsProcessed);
+            }
+            if(manualRedactions.getForceRedactions() != null) {
+                manualRedactions.getForceRedactions().forEach(forceRedactionPersistenceService::markAsProcessed);
+            }
+            if(manualRedactions.getImageRecategorization() != null) {
+                manualRedactions.getImageRecategorization().forEach(recategorizationPersistenceService::markAsProcessed);
+            }
+        }
     }
 
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/NerMessageReceiver.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/NerMessageReceiver.java
index de84dc841..df861ad78 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/NerMessageReceiver.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/NerMessageReceiver.java
@@ -36,7 +36,7 @@ public class NerMessageReceiver {
         String fileId = (String) entityResponse.get("fileId");
 
         log.info("Received NER Message from {} {}", dossierId, fileId);
-        fileStatusService.addToAnalysisQueue(dossierId, fileId, 2, null);
+        fileStatusService.setStatusAnalyse(dossierId, fileId, 1);
     }