diff --git a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
index 9a3b050ef..55cbf737a 100644
--- a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
+++ b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/Worker.scala
@@ -534,22 +534,21 @@ private[celeborn] class Worker(
     new Thread(new Runnable {
       override def run(): Unit = {
         logInfo("Shutdown hook called.")
+        // During shutdown, to avoid allocate slots in this worker,
+        // add this worker to master's blacklist. When restart, register worker will
+        // make master remove this worker from blacklist.
+        try {
+          rssHARetryClient.askSync(
+            ReportWorkerUnavailable(List(workerInfo).asJava),
+            OneWayMessageResponse.getClass)
+        } catch {
+          case e: Throwable =>
+            logError(
+              s"Fail report to master, need wait PartitionLocation auto release: \n$partitionLocationInfo",
+              e)
+        }
         shutdown.set(true)
         if (gracefulShutdown) {
-          // During graceful shutdown, to avoid allocate slots in this worker,
-          // add this worker to master's blacklist. When restart, register worker will
-          // make master remove this worker from blacklist.
-          try {
-            rssHARetryClient.askSync(
-              ReportWorkerUnavailable(List(workerInfo).asJava),
-              OneWayMessageResponse.getClass)
-          } catch {
-            case e: Throwable =>
-              logError(
-                s"Fail report to master, need wait PartitionLocation auto release: \n$partitionLocationInfo",
-                e)
-          }
-
           val interval = conf.workerGracefulShutdownCheckSlotsFinishedInterval
           val timeout = conf.workerGracefulShutdownCheckSlotsFinishedTimeoutMs
           var waitTimes = 0