diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp
index 17997aaf5..bac6a74d8 100644
--- a/src/nhttpd/yhttpd.cpp
+++ b/src/nhttpd/yhttpd.cpp
@@ -107,6 +107,7 @@ void yhttpd_reload_config() {
 #ifndef Y_CONFIG_BUILD_AS_DAEMON
 void * nhttpd_main_thread(void *) {
 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 	aprintf("Webserver %s tid %ld\n", WEBSERVERNAME, syscall(__NR_gettid));
 	yhttpd = new Cyhttpd();
 	//CLogging::getInstance()->setDebug(true);
diff --git a/src/nhttpd/yhttpd_core/ywebserver.cpp b/src/nhttpd/yhttpd_core/ywebserver.cpp
index 601b966a3..2b9c1e503 100644
--- a/src/nhttpd/yhttpd_core/ywebserver.cpp
+++ b/src/nhttpd/yhttpd_core/ywebserver.cpp
@@ -218,6 +218,8 @@ bool CWebserver::run(void) {
 		CySocket *newConnectionSock;
 		if (!(newConnectionSock = listenSocket.accept())) //Now: Blocking wait
 		{
+			pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+			pthread_testcancel();
 			dperror("Socket accept error. Continue.\n");
 			continue;
 		}