diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index 73c5a81b..afc6a3fc 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -255,7 +255,8 @@ def main():
 
     # wait for app to close
     try:
-        t.join()
+        while True:
+            time.sleep(0.5)
     except KeyboardInterrupt:
         web.stop(app.port)
     finally: