diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 4f0084303b..c51f235e21 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -789,6 +789,11 @@ namespace OpenSim.Region.Environment.Scenes
         public void DetachToGround()
         {
             ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar);
+            if (avatar == null)
+                return;
+
+            avatar.RemoveAttachment(this);
+
             Vector3 detachedpos = new Vector3(127f,127f,127f);
             if (avatar == null)
                 return;