diff --git a/main/http.c b/main/http.c
index 0a78446968..d56f098c97 100644
--- a/main/http.c
+++ b/main/http.c
@@ -504,6 +504,8 @@ static void *http_root(void *data)
 		}
 		ser = ast_calloc(1, sizeof(*ser));
 		if (ser) {
+			int flags = fcntl(fd, F_GETFL);
+			fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
 			ser->fd = fd;
 			memcpy(&ser->requestor, &sin, sizeof(ser->requestor));
 			if ((ser->f = fdopen(ser->fd, "w+"))) {
diff --git a/main/manager.c b/main/manager.c
index 2f3f1c5bbd..f0fa6400ce 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2157,6 +2157,9 @@ static void *accept_thread(void *ignore)
 			/* For safety, make sure socket is non-blocking */
 			flags = fcntl(as, F_GETFL);
 			fcntl(as, F_SETFL, flags | O_NONBLOCK);
+		} else {
+			flags = fcntl(as, F_GETFL);
+			fcntl(as, F_SETFL, flags & ~O_NONBLOCK);
 		}
 		ast_mutex_init(&s->__lock);
 		s->fd = as;