diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java
index 0ef8811fba..03f1f64f2e 100644
--- a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java
+++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java
@@ -435,7 +435,9 @@ AgentBean genUpdateBeanByReport(PingReportBean report, AgentBean agent) {
             updateBean.setStart_date(agent.getStart_date());
         }
 
-        if (report.getDeployStage() == DeployStage.SERVING_BUILD && updateBean.getFirst_deploy()) {
+        if (Boolean.TRUE.equals(updateBean.getFirst_deploy())
+                && (report.getDeployStage() == DeployStage.SERVING_BUILD
+                        || updateBean.getState() == AgentState.PAUSED_BY_SYSTEM)) {
             // turn off first deploy flag
             updateBean.setFirst_deploy(false);
             updateBean.setFirst_deploy_time(currentTime);