diff --git a/copyparty/svchub.py b/copyparty/svchub.py
index 0cdb1fb2..5e2d9cb1 100644
--- a/copyparty/svchub.py
+++ b/copyparty/svchub.py
@@ -182,6 +182,7 @@ class SvcHub(object):
                 pass
 
             self.shutdown()
+            thr.join()
         else:
             self.stop_thr()
 
@@ -206,6 +207,9 @@ class SvcHub(object):
 
         self.stopping = True
         self.stop_req = True
+        with self.stop_cond:
+            self.stop_cond.notify_all()
+
         ret = 1
         try:
             with self.log_mutex: