diff --git a/src/GameLogic/PlayerActions/Skills/AreaSkillAttackAction.cs b/src/GameLogic/PlayerActions/Skills/AreaSkillAttackAction.cs
index fb39be878..353861876 100644
--- a/src/GameLogic/PlayerActions/Skills/AreaSkillAttackAction.cs
+++ b/src/GameLogic/PlayerActions/Skills/AreaSkillAttackAction.cs
@@ -168,6 +168,12 @@ private async ValueTask PerformAutomaticHitsAsync(Player player, ushort extraTar
             return;
         }
 
+        // Skills that move attacker to target (e.g., Twisting Slash, Death Stab) require a weapon
+        if (skill.MovesToTarget && player.Inventory?.GetRandomOffensiveItem() is null)
+        {
+            return;
+        }
+
         if (player.Attributes[Stats.AmmunitionConsumptionRate] > player.Attributes[Stats.AmmunitionAmount])
         {
             return;
diff --git a/src/Web/AdminPanel/Pages/EditConfigGrid.razor.cs b/src/Web/AdminPanel/Pages/EditConfigGrid.razor.cs
index 68966bbb9..63ea892bf 100644
--- a/src/Web/AdminPanel/Pages/EditConfigGrid.razor.cs
+++ b/src/Web/AdminPanel/Pages/EditConfigGrid.razor.cs
@@ -203,6 +203,7 @@ private async Task OnCreateButtonClickAsync()
         var modalType = typeof(ModalCreateNew<>).MakeGenericType(this.Type!);
 
         parameters.Add(nameof(ModalCreateNew<object>.Item), newObject);
+        parameters.Add(nameof(ModalCreateNew<object>.PersistenceContext), creationContext);
         var options = new ModalOptions
         {
             DisableBackgroundCancel = true,