diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 3769302a..b84a0fa2 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -136,4 +136,8 @@ void DaemonManager::closing()
 {
     qDebug() << __FUNCTION__;
     stop();
+    // Wait for daemon to stop before exiting (max 10 secs)
+    if(initialized){
+        m_daemon->waitForFinished(10000);
+    }
 }