diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 900327a792..422a8bce18 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -250,6 +250,8 @@ namespace OpenSim.Server.Base
                 }
             }
 
+            MainServer.Stop();
+
             MemoryWatchdog.Enabled = false;
             Watchdog.Enabled = false;
             WorkManager.Stop();