diff --git a/service/incident_service.go b/service/incident_service.go
index 8079fb6..98402dd 100644
--- a/service/incident_service.go
+++ b/service/incident_service.go
@@ -525,8 +525,14 @@ func (i *incidentService) UpdateIncident(c *gin.Context) {
 	incidentEntity.UpdatedAt = time.Now()
 	incidentEntity.UpdatedBy = userInfo.ID
 	i.incidentRepository.UpdateIncident(incidentEntity)
+
 	i.messageUpdateAction.ProcessAction(incidentEntity.SlackChannel)
 
+	incidentStatusEntity, _ := i.incidentRepository.FindIncidentStatusById(incidentEntity.Status)
+	if incidentStatusEntity.IsTerminalStatus && incidentEntity.SeverityId != 1 && incidentEntity.SeverityId != 2 {
+		i.socketModeClient.ArchiveConversation(incidentEntity.SlackChannel)
+	}
+
 	c.JSON(http.StatusOK, common.SuccessResponse("incident updated successfully", http.StatusOK))
 }
 
@@ -573,7 +579,6 @@ func (i *incidentService) UpdateStatus(
 			if incidentStatus.IsTerminalStatus {
 				now := time.Now()
 				incidentEntity.EndTime = &now
-				i.socketModeClient.ArchiveConversation(slackChannel)
 			}
 		}
 	}