diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 7fdff603cb..74f11a4071 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -77,7 +77,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         {
             m_openSim = openSim;
             m_httpServer = openSim.HttpServer;
-            MainServer.Instance = m_httpServer;
 
             InitialiseCommsManager(openSim);
         }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index c7aeca14e3..fa6c9a8ce9 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -111,6 +111,8 @@ namespace OpenSim.Region.ClientStack
             m_log.Info("[REGION]: Starting HTTP server");
             m_httpServer.Start();
 
+            MainServer.Instance = m_httpServer;
+
             base.StartupSpecific();
         }