diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
index bd486c8..7a7d794 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
@@ -94,7 +94,10 @@
             if (value != _affiliationArea)
             {
                 _affiliationArea = value;
-                OnAffiliationChange();
+                if (!IsDestroyed)
+                {
+                    OnAffiliationChange();
+                }
             }
         }
     }
@@ -1079,6 +1082,11 @@
         }
 
         IsDestroyed = true;
+        if (AffiliationArea != null)
+        {
+            AffiliationArea.RemoveItem(this);
+        }
+        
         QueueFree();
         OnDestroy();