diff --git a/src/devices/gpoddevice.cpp b/src/devices/gpoddevice.cpp
index be3f76bcb..c5aa2f7a4 100644
--- a/src/devices/gpoddevice.cpp
+++ b/src/devices/gpoddevice.cpp
@@ -62,6 +62,11 @@ void GPodDevice::LoadFinished(Itdb_iTunesDB* db) {
   db_ = db;
   db_wait_cond_.wakeAll();
 
+  loader_thread_->quit();
+  loader_thread_->wait(1000);
+  loader_thread_->deleteLater();
+  loader_thread_ = nullptr;
+
   loader_->deleteLater();
   loader_ = nullptr;
 }