diff --git a/repertory/librepertory/src/utils/tasks.cpp b/repertory/librepertory/src/utils/tasks.cpp
index 551a34a4..06dc0392 100644
--- a/repertory/librepertory/src/utils/tasks.cpp
+++ b/repertory/librepertory/src/utils/tasks.cpp
@@ -107,6 +107,11 @@ void tasks::task_thread() {
 
     try {
       task.action(stop_requested_);
+      if (stop_requested_) {
+        release();
+        return;
+      }
+
       std::this_thread::sleep_for(std::chrono::milliseconds(task.delay_ms));
       --count_;
     } catch (const std::exception &e) {