diff --git a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/PIServer.java b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/PIServer.java
index ee3a0c40d3..0d9312e1ad 100644
--- a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/PIServer.java
+++ b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/PIServer.java
@@ -145,7 +145,6 @@ private void acceptLoop( ServerSocketChannel server, ClientManager clientManager
         while ( true ) {
             try {
                 SocketChannel s = server.accept();
-                s.socket().setTcpNoDelay( true );
                 long connectionId = ID_COUNTER.getAndIncrement();
                 Thread t = new Thread( () -> acceptConnection( s, name, connectionId, createTransport, clientManager ), String.format( "ProtoInterface" + name + "ClientConnection%d", connectionId ) );
                 t.start();
diff --git a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/transport/PlainTransport.java b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/transport/PlainTransport.java
index 1a803cbccc..87a76b6bcb 100644
--- a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/transport/PlainTransport.java
+++ b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/transport/PlainTransport.java
@@ -18,6 +18,7 @@
 
 import java.io.EOFException;
 import java.io.IOException;
+import java.net.StandardSocketOptions;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.SocketChannel;
@@ -98,6 +99,7 @@ public void close() {
 
     public static Transport accept( SocketChannel con ) {
         try {
+            con.setOption( StandardSocketOptions.TCP_NODELAY, true );
             return new PlainTransport( con );
         } catch ( IOException e ) {
             throw new GenericRuntimeException( e );