diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 02dab75b6..9bcafe2b6 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -2437,6 +2437,15 @@ namespace Game.Entities
                     Delete();
                     return;
                 }
+                case GameObjectTypes.CapturePoint:
+                {
+                    Player player = user.ToPlayer();
+                    if (player == null)
+                        return;
+
+                    AssaultCapturePoint(player);
+                    return;
+                }
                 case GameObjectTypes.ItemForge:
                 {
                     GameObjectTemplate info = GetGoInfo();
diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index 7159fb07b..105d48554 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -1235,11 +1235,6 @@ namespace Game.Spells
                         return;
                     }
                 }
-                else if (goInfo.type == GameObjectTypes.CapturePoint)
-                {
-                    gameObjTarget.AssaultCapturePoint(player);
-                    return;
-                }
                 else if (goInfo.type == GameObjectTypes.FlagStand)
                 {
                     //CanUseBattlegroundObject() already called in CheckCast()
@@ -1252,11 +1247,6 @@ namespace Game.Spells
                         return;
                     }
                 }
-                else if (goInfo.type == GameObjectTypes.NewFlag)
-                {
-                    gameObjTarget.Use(player);
-                    return;
-                }
                 else if (m_spellInfo.Id == 1842 && gameObjTarget.GetGoInfo().type == GameObjectTypes.Trap && gameObjTarget.GetOwner() != null)
                 {
                     gameObjTarget.SetLootState(LootState.JustDeactivated);