diff --git a/app/audio/audiomanager.cpp b/app/audio/audiomanager.cpp
index d8b367d50..22ee8d906 100644
--- a/app/audio/audiomanager.cpp
+++ b/app/audio/audiomanager.cpp
@@ -58,6 +58,7 @@ void AudioManager::RefreshDevices()
   // Refreshing devices can take some time, so we do it in a separate thread
   QThread* thread = new QThread();
   connect(thread, &QThread::finished, thread, &QThread::deleteLater);
+
   thread->start(QThread::LowPriority);
 
   AudioRefreshDevicesObject* refresher = new AudioRefreshDevicesObject();
@@ -221,6 +222,7 @@ void AudioManager::RefreshThreadDone()
   }
 
   // Clean up refresher object
+  refresher->thread()->quit();
   refresher->deleteLater();
 
   emit DeviceListReady();
@@ -250,8 +252,5 @@ void AudioRefreshDevicesObject::Refresh()
   output_devices_ = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
   input_devices_ = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
 
-  // Move back to main thread
-  moveToThread(QApplication::instance()->thread());
-
   emit ListsReady();
 }