diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 3e61c5d7b..480be1f44 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -831,13 +831,20 @@ namespace Game.Entities
                     if (m_respawnDelayTime == 0)
                         return;
 
-                    if (!m_spawnedByDefault)
+                    if (m_spawnId == 0)
                     {
                         m_respawnTime = 0;
                         Delete();
                         return;
                     }
 
+                    if (!m_spawnedByDefault)
+                    {
+                        m_respawnTime = 0;
+                        DestroyForNearbyPlayers();
+                        return;
+                    }
+
                     uint respawnDelay = m_respawnDelayTime;
                     uint scalingMode = WorldConfig.GetUIntValue(WorldCfg.RespawnDynamicMode);
                     if (scalingMode != 0)