diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
index bcdb3aa9e..ef1769bc4 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
@@ -101,7 +101,7 @@ public class AnalysisFlagsCalculationService {
         }
 
         OffsetDateTime lastManualRedactionTime = file.getLastManualRedaction();
-        if(lastModification == null || lastManualRedactionTime.isAfter(lastModification)){
+        if(lastModification == null || lastManualRedactionTime != null && lastManualRedactionTime.isAfter(lastModification)){
             lastModification = lastManualRedactionTime;
         }