diff --git a/lib/web.cpp b/lib/web.cpp
index 04ce7c8a1..3ea70de9f 100644
--- a/lib/web.cpp
+++ b/lib/web.cpp
@@ -281,6 +281,7 @@ void Web::stop()
 	logger->info("Stopping sub-system");
 
 	running = false;
+	lws_cancel_service(context);
 	thread.join();
 
 	lws_context_destroy(context);