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 6fe36ebb7..6e3a3d2ca 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
@@ -204,10 +204,10 @@ public class FileStatusService {
         FileEntity fileStatus = fileStatusPersistenceService.getStatus(fileId);
         String lastReviewer = fileStatus.getLastReviewer();
         String lastApprover = fileStatus.getLastApprover();
-        if(WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) {
+        if(StringUtils.isNotEmpty(currentReviewer)  && WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) {
             lastReviewer = currentReviewer;
         }
-        if(WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) {
+        if(StringUtils.isNotEmpty(currentReviewer)  && WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) {
             lastApprover = currentReviewer;
         }