diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index f832f81bc0..c09e53d1d2 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -141,11 +141,10 @@ namespace OpenSim.Framework.Servers
             
             MainServer.Stop();
 
-            Thread.Sleep(5000);
+            Thread.Sleep(500);
             Util.StopThreadPool();
             WorkManager.Stop();
 
-            Thread.Sleep(1000);
             RemovePIDFile();
 
             m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");