diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index a5a447081b..d99de7a63c 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -64,6 +64,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         protected OpenSimBase m_openSim;
 
         protected BaseHttpServer m_httpServer;
+
         protected CommunicationsManager m_commsManager;
         protected GridInfoService m_gridInfoService;
         protected IHyperlink HGServices = null;
@@ -114,20 +115,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         {
             LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile);
 
-            if ((openSim is OpenSim) || (openSim is OpenSimBackground))
-            {
-                // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
-                if (m_openSim.ConfigurationSettings.Standalone)
-                {
-                    InitialiseStandaloneServices(libraryRootFolder);
-                }
-                else
-                {
-                    // We are in grid mode
-                    InitialiseGridServices(libraryRootFolder);
-                }
-            }
-            else if (openSim is HGOpenSimNode)
+            if (openSim is HGOpenSimNode)
             {
                 HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
 
@@ -143,6 +131,19 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                 }
                 hgNode.HGServices = HGServices;
             }
+            else
+            {
+                // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
+                if (m_openSim.ConfigurationSettings.Standalone)
+                {
+                    InitialiseStandaloneServices(libraryRootFolder);
+                }
+                else
+                {
+                    // We are in grid mode
+                    InitialiseGridServices(libraryRootFolder);
+                }
+            }
 
             openSim.CommunicationsManager = m_commsManager;
         }