diff --git a/daemon/engine.h b/daemon/engine.h
index 6d0a73b7042c07ddc08eb50a640c078f02dcbec7..62b482684a7f7c91c7556fcfc257d6eb438e1ccb 100644
--- a/daemon/engine.h
+++ b/daemon/engine.h
@@ -34,7 +34,7 @@
 # endif
 #endif
 #ifndef RECVMMSG_BATCH
-#define RECVMMSG_BATCH 4
+#define RECVMMSG_BATCH 1
 #endif
 #ifndef QUERY_RATE_THRESHOLD
 #define QUERY_RATE_THRESHOLD (2 * MP_FREELIST_SIZE) /**< Nr of parallel queries considered as high rate */
diff --git a/daemon/io.c b/daemon/io.c
index 3ec7283204f4c5a539fbd7c9b8a107ef9ff1f624..c6d269c672a4f81f28ebac403ec8870a895d5f70 100644
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -36,11 +36,12 @@
 
 static void check_bufsize(uv_handle_t* handle)
 {
+	return; /* TODO: resurrect after https://github.com/libuv/libuv/issues/419 */
 	/* We want to buffer at least N waves in advance.
 	 * This is magic presuming we can pull in a whole recvmmsg width in one wave.
 	 * Linux will double this the bufsize wanted.
 	 */
-	const int bufsize_want = RECVMMSG_BATCH * 65535 * 2;
+	const int bufsize_want = 2 * sizeof( ((struct worker_ctx *)NULL)->wire_buf ) ;
 	negotiate_bufsize(uv_recv_buffer_size, handle, bufsize_want);
 	negotiate_bufsize(uv_send_buffer_size, handle, bufsize_want);
 }
diff --git a/daemon/session.c b/daemon/session.c
index 176ab8dd367a5ae11efa98a777567641588df3eb..a5bdff28075a07c8d2bf5390a7eaeb2f3823f2a1 100644
--- a/daemon/session.c
+++ b/daemon/session.c
@@ -270,6 +270,14 @@ int session_set_handle(struct session *session, uv_handle_t *handle)
 		session->wire_buf = wire_buf;
 		session->wire_buf_size = KNOT_WIRE_MAX_PKTSIZE;
 	} else if (handle->type == UV_UDP) {
+		/* We use the singleton buffer from worker for all UDP (!)
+		 * libuv documentation doesn't really guarantee this is OK,
+		 * but the implementation for unix systems does not hold
+		 * the buffer (both UDP and TCP) - always makes a NON-blocking
+		 * syscall that fills the buffer and immediately calls
+		 * the callback, whatever the result of the operation.
+		 * We still need to keep in mind to only touch the buffer
+		 * in this callback... */
 		assert(handle->loop->data);
 		struct worker_ctx *worker = handle->loop->data;
 		session->wire_buf = worker->wire_buf;
diff --git a/daemon/worker.h b/daemon/worker.h
index dd98476728eed04e5ef4fc555def29893d9389e1..9e988c7f26dfec533763ddba44a5c8382c7f8d63 100644
--- a/daemon/worker.h
+++ b/daemon/worker.h
@@ -127,11 +127,8 @@ struct worker_ctx {
 	struct sockaddr_in out_addr4;
 	struct sockaddr_in6 out_addr6;
 
-#if __linux__
 	uint8_t wire_buf[RECVMMSG_BATCH * KNOT_WIRE_MAX_PKTSIZE];
-#else
-	uint8_t wire_buf[KNOT_WIRE_MAX_PKTSIZE];
-#endif
+
 	struct {
 		size_t concurrent;
 		size_t rconcurrent;