diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/AnalysisFlagsCalculationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/AnalysisFlagsCalculationService.java
index e4c75d9b6..43e16fcd3 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/AnalysisFlagsCalculationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/AnalysisFlagsCalculationService.java
@@ -117,6 +117,10 @@ public class AnalysisFlagsCalculationService {
                 hasUpdates = true;
             }
 
+            if (entry.getNumberOfComments() > 0) {
+                hasComments = true;
+            }
+
         }
 
         log.info("Flag Calculations for file: {} took: {}ms", fileId, System.currentTimeMillis() - startTime);