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