diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index e8005791f..748be36bc 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -2293,9 +2293,16 @@ namespace Game.Entities
                         if (player.GetVehicle() != null)
                             return;
 
+                        if (HasFlag(GameObjectFlags.InUse))
+                            return;
+
+                        if (!MeetsInteractCondition(player))
+                            return;
+
                         player.RemoveAurasByType(AuraType.ModStealth);
                         player.RemoveAurasByType(AuraType.ModInvisibility);
-                        return;                                     //we don;t need to delete flag ... it is despawned!
+                        spellId = GetGoInfo().FlagStand.pickupSpell;
+                        spellCaster = null;
                     }
                     break;
                 }