diff --git a/src/utils/R2Task.cpp b/src/utils/R2Task.cpp
index cd7ee3ed..33f42492 100644
--- a/src/utils/R2Task.cpp
+++ b/src/utils/R2Task.cpp
@@ -12,7 +12,9 @@ R2Task::R2Task(const QString &cmd)
 
 R2Task::~R2Task()
 {
-    r_core_task_del(Core()->core(), task->id);
+    // Don't delete current task as it might be still running
+    // Just delete any task that is done.
+    r_core_task_del_all_done(Core()->core());
 }
 
 void R2Task::taskFinishedCallback(void *user, char *)