diff --git a/lib/puma/server.rb b/lib/puma/server.rb
index f0841200..a62d0517 100644
--- a/lib/puma/server.rb
+++ b/lib/puma/server.rb
@@ -126,6 +126,10 @@ module Puma
     end
 
     def process_client(client)
+      if client.kind_of? TCPSocket
+        client.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      end
+
       begin
         while true
           parser = HttpParser.new