diff --git a/src/core/deletefiles.cpp b/src/core/deletefiles.cpp
index 3ec4326e9..af60bdc6c 100644
--- a/src/core/deletefiles.cpp
+++ b/src/core/deletefiles.cpp
@@ -56,7 +56,7 @@ void DeleteFiles::Start(const SongList &songs) {
   songs_ = songs;
 
   task_id_ = task_manager_->StartTask(tr("Deleting files"));
-  task_manager_->SetTaskBlocksCollectionScans(true);
+  task_manager_->SetTaskBlocksCollectionScans(task_id_);
 
   thread_ = new QThread(this);
   QObject::connect(thread_, &QThread::started, this, &DeleteFiles::ProcessSomeFiles);
diff --git a/src/organize/organize.cpp b/src/organize/organize.cpp
index 014c33522..184956bdb 100644
--- a/src/organize/organize.cpp
+++ b/src/organize/organize.cpp
@@ -105,7 +105,7 @@ void Organize::Start() {
   if (thread_) return;
 
   task_id_ = task_manager_->StartTask(tr("Organizing files"));
-  task_manager_->SetTaskBlocksCollectionScans(true);
+  task_manager_->SetTaskBlocksCollectionScans(task_id_);
 
   thread_ = new QThread;
   QObject::connect(thread_, &QThread::started, this, &Organize::ProcessSomeFiles);