diff --git a/velox/exec/Task.cpp b/velox/exec/Task.cpp
index 61b44d9789be..4fba62147af5 100644
--- a/velox/exec/Task.cpp
+++ b/velox/exec/Task.cpp
@@ -308,8 +308,9 @@ Task::Task(
 }
 
 Task::~Task() {
-  removeFromTaskList();
-
+  SCOPE_EXIT {
+    removeFromTaskList();
+  };
   // TODO(spershin): Temporary code designed to reveal what causes SIGABRT in
   // jemalloc when destroying some Tasks.
   std::string clearStage;