1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index d189580..57931d4 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -285,7 +285,12 @@ namespace OpenSim.Framework.Servers
         public static bool RemoveHttpServer(uint port)
         {
             lock (m_Servers)
+            {
+                if (instance != null && instance.Port == port)
+                    instance = null;
+
                 return m_Servers.Remove(port);
+            }
         }
 
         /// <summary>