diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs
index 7f6186c9f6..cfebba341a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs
@@ -86,7 +86,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour
 
         public void AddRegion(Scene scene)
         {
-            // Always add
             m_Scenes.Add(scene);
 
             if (!m_Enabled)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs
index b0bd428191..8ea4ca7c49 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs
@@ -113,13 +113,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour
             if (!m_Enabled)
                 return;
 
+            m_MapService = scene.CommsManager.GridService;
+            m_LocalService.AddRegion(scene);
             scene.RegisterModuleInterface<INeighbourService>(this);
         }
 
         public void RemoveRegion(Scene scene)
         {
             if (m_Enabled && m_Scenes.Contains(scene))
-                m_Scenes.Remove(scene);
+                m_LocalService.RemoveRegion(scene);
         }
 
         public void RegionLoaded(Scene scene)
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
index d6f5fe998a..26f606d352 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Services.Connectors
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private IGridServices m_MapService = null;
+        protected IGridServices m_MapService = null;
 
         public NeighbourServicesConnector()
         {