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 c0a819d29..9a3b050ef 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
@@ -304,13 +304,10 @@ private[celeborn] class Worker(
         activeShuffleKeys,
         estimatedAppDiskUsage),
       classOf[HeartbeatResponse])
-    if (response.registered) {
-      response.expiredShuffleKeys.asScala.foreach(shuffleKey => workerInfo.releaseSlots(shuffleKey))
-      cleanTaskQueue.put(response.expiredShuffleKeys)
-    } else {
+    response.expiredShuffleKeys.asScala.foreach(shuffleKey => workerInfo.releaseSlots(shuffleKey))
+    cleanTaskQueue.put(response.expiredShuffleKeys)
+    if (!response.registered) {
       logError("Worker not registered in master, clean expired shuffle data and register again.")
-      // Clean expired shuffle.
-      cleanup(response.expiredShuffleKeys)
       try {
         registerWithMaster()
       } catch {