diff --git a/postgresql_proxy/proxy.py b/postgresql_proxy/proxy.py
index ba8b31e..e3d17e9 100644
--- a/postgresql_proxy/proxy.py
+++ b/postgresql_proxy/proxy.py
@@ -71,6 +71,7 @@ def _create_pg_connection(self, address, context):
         redirect_config = self.instance_config.redirect
 
         pg_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        pg_sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         pg_sock.connect((redirect_config.host, redirect_config.port))
         pg_sock.setblocking(False)
 
@@ -130,6 +131,7 @@ def accept_wrapper(self, sock: socket.socket):
 
         # Accept the raw connection
         clientsocket, address = sock.accept()
+        clientsocket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         # On macOS, accepted sockets inherit O_NONBLOCK from the listening socket.
         # SSL negotiation uses blocking recv, so we must set blocking explicitly here.
         clientsocket.setblocking(True)