diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 480be1f44..bcca71419 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -831,17 +831,17 @@ namespace Game.Entities
                     if (m_respawnDelayTime == 0)
                         return;
 
-                    if (m_spawnId == 0)
+                    if (m_spawnedByDefault && m_spawnId != 0)
                     {
                         m_respawnTime = 0;
-                        Delete();
+                        DestroyForNearbyPlayers();
                         return;
                     }
 
                     if (!m_spawnedByDefault)
                     {
                         m_respawnTime = 0;
-                        DestroyForNearbyPlayers();
+                        Delete();
                         return;
                     }