diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6f2b26785f..0457f322f3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1183,6 +1183,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Check to see if Dispose has already been called.
             if (!disposed)
             {
+                disposed = true;
                 IsDeleted = true;
                 if (m_updateAgentReceivedAfterTransferEvent != null)
                 {
@@ -1209,9 +1210,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 scriptedcontrols.Clear();
                 ControllingClient = null;
-                LifecycleState = ScenePresenceState.Removed;
-
-                disposed = true;
             }
         }