diff --git a/lib/java/src/transport/TServerSocket.java b/lib/java/src/transport/TServerSocket.java
index ab2b5e7..22f8afa 100644
--- a/lib/java/src/transport/TServerSocket.java
+++ b/lib/java/src/transport/TServerSocket.java
@@ -85,7 +85,11 @@
       throw new TTransportException("No underlying server socket.");
     }
     try {
+      // Accept socket and tune TCP params
       Socket result = serverSocket_.accept();
+      client.setSoLinger(false, 0);
+      client.setTcpNoDelay(true);
+      // Wrap in TSocket and set timeout
       TSocket result2 = new TSocket(result);
       result2.setTimeout(clientTimeout_);
       return result2;