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 d50936be4..ce14953ee 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,11 +204,11 @@ public class FileStatusService {
         FileEntity fileStatus = fileStatusPersistenceService.getStatus(fileId);
         String lastReviewer = fileStatus.getLastReviewer();
         String lastApprover = fileStatus.getLastApprover();
-        if(StringUtils.isNotEmpty(assignee) && WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) {
-            lastReviewer = assignee;
+        if(WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) {
+            lastReviewer = StringUtils.isNotEmpty(assignee)? assignee: fileStatus.getAssignee();
         }
-        if(StringUtils.isNotEmpty(assignee) && WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) {
-            lastApprover = assignee;
+        if(WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) {
+            lastApprover = StringUtils.isNotEmpty(assignee)? assignee: fileStatus.getAssignee();
         }
 
         fileStatusPersistenceService.setAssignee(fileId, assignee, lastReviewer, lastApprover);