diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 239fe82608..106c41f720 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -414,7 +414,10 @@ void GameObject::Update(uint32 /*p_time*/)
 
             if(GetOwnerGUID())
             {
-                m_respawnTime = 0;
+                if(Unit* owner = GetOwner())
+                    owner->RemoveGameObject(this, false);
+
+                SetRespawnTime(0);
                 Delete();
                 return;
             }