diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index 1dbb402..bc02c70 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -164,6 +164,8 @@
 
   delete m_watcher; // stop filewatching ASAP
   delete m_dispatcher; // stop dispatcher ASAP, but after watcher (to prevent triggering callbacks on deleted object)
+  m_httpServer->handle_stop();
+  m_httpServerThread.join();
   delete m_httpServer;
 
   // cleanup