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 0a3cf149d..5da2aa252 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
@@ -105,11 +105,11 @@ public class AnalysisFlagsCalculationService {
                 lastRedactionModification = lastChange.getDateTime();
             }
 
-            if (!hasRedactions && entry.isRedacted() && !entry.isRecommendation()) {
+            if (!hasRedactions && entry.isRedacted() && !entry.isRecommendation() && (lastChange == null || lastChange.getType() != ChangeType.REMOVED)) {
                 hasRedactions = true;
             }
 
-            if (!hasHints && entry.isHint()) {
+            if (!hasHints && entry.isHint() && (lastChange == null || lastChange.getType() != ChangeType.REMOVED)) {
                 hasHints = true;
             }