diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java
index ea5728d1a..cc82662fc 100644
--- a/source/de/anomic/server/serverCore.java
+++ b/source/de/anomic/server/serverCore.java
@@ -379,8 +379,7 @@ public final class serverCore extends serverAbstractBusyThread implements server
                 // controlSocket.setTcpNoDelay(true);
                 
                 // set a non-zero linger, that means that a socket.close() blocks until all data is written
-                // controlSocket.setSoLinger(false, this.timeout);
-                controlSocket.setSoLinger(true, this.timeout);
+                controlSocket.setSoLinger(false, this.timeout);
                 
                 // ensure that MTU-48 is not exceeded to prevent that routers cannot handle large data packets
                 // read http://www.cisco.com/warp/public/105/38.shtml for explanation