diff --git a/io/dap_server.c b/io/dap_server.c
index 0996e5335810de121a9df563c7088bc91e91305e..7ceb27da76b2d3817e899dfebfa5fefe5a8d542f 100644
--- a/io/dap_server.c
+++ b/io/dap_server.c
@@ -370,6 +370,9 @@ static void s_es_server_accept(dap_events_socket_t *a_es_listener, SOCKET a_remo
         l_es_new->remote_port = strtol(l_port_str, NULL, 10);
         debug_if(l_server->ext_log, L_INFO, "Connection accepted from %s : %hu, socket %"DAP_FORMAT_SOCKET,
                                             l_es_new->remote_addr_str, l_es_new->remote_port, a_remote_socket);
+        int one = 1;
+        if ( setsockopt(l_es_new->socket, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one)) < 0 )
+            log_it(L_WARNING, "Can't disable Nagle alg, error %d: %s", errno, dap_strerror(errno));
         break;
     default:
         log_it(L_ERROR, "Unsupported protocol family %hu from accept()", l_family);