diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index abc07c6eb38..a65b0c57ae0 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -693,17 +693,17 @@ void GameObject::Update(uint32 diff)
             if (!m_respawnDelayTime)
                 return;
 
-            if (!m_spawnId)
-             {
-                 m_respawnTime = 0;
-                 Delete();
-                 return;
-             }
+            if (!m_spawnedByDefault && m_spawnId)
+            {
+                m_respawnTime = 0;
+                DestroyForNearbyPlayers();
+                return;
+            }
 
             if (!m_spawnedByDefault)
             {
                 m_respawnTime = 0;
-                DestroyForNearbyPlayers();
+                Delete();
                 return;
             }