diff --git a/agent/agent.go b/agent/agent.go
index d6d7a91..16d1c1c 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -154,7 +154,7 @@ func New(logger *logrus.Logger, version string) *Agent {
 		Option: service.KeyValue{
 			"StartType":              "automatic",
 			"OnFailure":              "restart",
-			"OnFailureDelayDuration": "5s",
+			"OnFailureDelayDuration": "12s",
 			"OnFailureResetPeriod":   10,
 		},
 	}
diff --git a/agent/rpc.go b/agent/rpc.go
index ce2a89c..b141be0 100644
--- a/agent/rpc.go
+++ b/agent/rpc.go
@@ -479,6 +479,7 @@ func (a *Agent) RunRPC() {
 					atomic.StoreUint32(&agentUpdateLocker, 0)
 					nc.Flush()
 					nc.Close()
+					a.ControlService(winSvcName, "stop")
 					os.Exit(0)
 				}
 			}(payload)