diff --git a/common/src/main/java/de/bluecolored/bluemap/common/web/http/HttpServer.java b/common/src/main/java/de/bluecolored/bluemap/common/web/http/HttpServer.java
index 6a671d3ae..223759c05 100644
--- a/common/src/main/java/de/bluecolored/bluemap/common/web/http/HttpServer.java
+++ b/common/src/main/java/de/bluecolored/bluemap/common/web/http/HttpServer.java
@@ -51,6 +51,7 @@ public HttpServer(String name, HttpRequestHandler requestHandler) throws IOExcep
     @Override
     public void handleConnection(SocketChannel connection) throws IOException {
         connection.socket().setSoTimeout(600000); // set a 10 min max idle timeout
+        connection.socket().setTcpNoDelay(true); // headers and body are separate writes, nagle + delayed-ack would stall each response ~40ms
         executor.execute(new HttpConnection(connection.socket(), requestHandler));
     }