diff --git a/lib/websocket.c b/lib/websocket.c
index 46521922f..14f2a1780 100644
--- a/lib/websocket.c
+++ b/lib/websocket.c
@@ -302,6 +302,7 @@ int websocket_init(int argc, char * argv[], config_setting_t *cfg)
 
 int websocket_deinit()
 {
+	pthread_cancel(global.thread);
 	pthread_join(global.thread, NULL);
 
 	lws_cancel_service(global.context);