diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index b745a3cca..048e87740 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -366,10 +366,9 @@ namespace Game.Entities
                 if (linkedGo != null)
                 {
                     SetLinkedTrap(linkedGo);
-                    map.AddToMap(linkedGo);
+                    if (!map.AddToMap(linkedGo))
+                        linkedGo.Dispose();
                 }
-                else
-                    linkedGo.Dispose();
             }
 
             return true;