diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 8b2f7a9da7d..abc07c6eb38 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -693,10 +693,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;
             }