diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
index 5d1f41f3f5..3a96f03cec 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
@@ -170,9 +170,10 @@ namespace OSHttpServer
                 if(socket == null)
                     continue;
 
-                socket.NoDelay = true;
                 try
                 {
+                    socket.NoDelay = true;
+
                     if (!OnAcceptingSocket(socket))
                     {
                         socket.Disconnect(true);