diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 05720f5b6..5a5310eaf 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -153,6 +153,12 @@ namespace Game.Entities
                 if (m_model != null)
                     if (GetMap().ContainsGameObjectModel(m_model))
                         GetMap().RemoveGameObjectModel(m_model);
+
+                // If linked trap exists, despawn it
+                GameObject linkedTrap = GetLinkedTrap();
+                if (linkedTrap != null)
+                    linkedTrap.DespawnOrUnsummon();
+
                 base.RemoveFromWorld();
 
                 if (m_spawnId != 0)
@@ -938,11 +944,6 @@ namespace Game.Entities
 
         public void Delete()
         {
-            // If nearby linked trap exists, despawn it
-            GameObject linkedTrap = GetLinkedTrap();
-            if (linkedTrap != null)
-                linkedTrap.DespawnOrUnsummon();
-
             SetLootState(LootState.NotReady);
             RemoveFromOwner();