diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 65e92874e8..a05effe33b 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -53,6 +53,10 @@ namespace OpenSim.Server
 
         public static int Main(string[] args)
         {
+            // Make sure we don't get outbound connections queueing
+            ServicePointManager.DefaultConnectionLimit = 50;
+            ServicePointManager.UseNagleAlgorithm = false;
+
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
             
             string registryLocation;