diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index 9ab9977ce9ce9078eeeb3af0ec44463d4d9e60aa..3b76d51ca6f5c353ced949c4630255b5461751e2 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -161,13 +161,13 @@ public class MasterServer extends AbstractServer {
         Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
             @Override
             public void run() {
-                logger.info("master server stopped");
                 if (zkMasterClient.getActiveMasterNum() <= 1) {
                     for (int i = 0; i < Constants.DOLPHINSCHEDULER_WARN_TIMES_FAILOVER; i++) {
                         zkMasterClient.getAlertDao().sendServerStopedAlert(
                                 1, OSUtils.getHost(), "Master-Server");
                     }
                 }
+                stop("shutdownhook");
             }
         }));
     }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index faf294cc6ece2f2eb4258a6de6cd6fe48ab726a3..733a9add6edee693a20391ea378c5b6b79b2eae1 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -122,7 +122,6 @@ public class WorkerServer extends AbstractServer {
      * master server not use web service
      */
     public static void main(String[] args) {
-
         SpringApplication app = new SpringApplication(WorkerServer.class);
 
         app.run(args);
@@ -175,15 +174,13 @@ public class WorkerServer extends AbstractServer {
         Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
             @Override
             public void run() {
-
-                logger.warn("worker server stopped");
                 // worker server exit alert
                 if (zkWorkerClient.getActiveMasterNum() <= 1) {
                     for (int i = 0; i < Constants.DOLPHINSCHEDULER_WARN_TIMES_FAILOVER; i++) {
                         alertDao.sendServerStopedAlert(1, OSUtils.getHost(), "Worker-Server");
                     }
                 }
-
+                stop("shutdownhook");
             }
         }));