diff --git a/src/executorlib/task_scheduler/base.py b/src/executorlib/task_scheduler/base.py
index 246e6e44..6c15d51e 100644
--- a/src/executorlib/task_scheduler/base.py
+++ b/src/executorlib/task_scheduler/base.py
@@ -244,4 +244,4 @@ def __del__(self):
         Clean-up the resources associated with the Executor.
         """
         with contextlib.suppress(AttributeError, RuntimeError):
-            self.shutdown(wait=False)
+            self.shutdown(wait=True)