1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index dfb57d955d6..438b5a3b061 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -794,10 +794,17 @@ void GameObject::Update(uint32 diff)
             if (!m_respawnDelayTime)
                 return;
 
+            if (!m_spawnId)
+             {
+                 m_respawnTime = 0;
+                 Delete();
+                 return;
+             }
+
             if (!m_spawnedByDefault)
             {
                 m_respawnTime = 0;
-                Delete();
+                DestroyForNearbyPlayers();
                 return;
             }