diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py
index 0dffb493..c7ae8fd3 100644
--- a/cli/onionshare_cli/__init__.py
+++ b/cli/onionshare_cli/__init__.py
@@ -541,6 +541,7 @@ def main(cwd=None):
     finally:
         # Shutdown
         web.cleanup()
+        t.join()
         onion.cleanup()