diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py
index 7b325704..7d2159c7 100644
--- a/desktop/src/onionshare/tab/mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/__init__.py
@@ -350,10 +350,12 @@ class Mode(QtWidgets.QWidget):
             self.startup_thread.quit()
         if self.onion_thread:
             self.common.log("Mode", "cancel_server: quitting onion thread")
-            self.onion_thread.quit()
+            self.onion_thread.terminate()
+            self.onion_thread.wait()
         if self.web_thread:
             self.common.log("Mode", "cancel_server: quitting web thread")
-            self.web_thread.quit()
+            self.web_thread.terminate()
+            self.web_thread.wait()
         self.stop_server()
 
     def cancel_server_custom(self):