diff --git a/src/Data/Skills/act_dex.lua b/src/Data/Skills/act_dex.lua
index 7ecd9bc9d4..81cbaf9bb2 100644
--- a/src/Data/Skills/act_dex.lua
+++ b/src/Data/Skills/act_dex.lua
@@ -312,10 +312,6 @@ skills["AnimateWeaponAltX"] = {
 	},
 	statDescriptionScope = "minion_spell_skill_stat_descriptions",
 	castTime = 0.6,
-	minionHasItemSet = true,
-	minionUses = {
-		["Weapon 1"] = true,
-	},
 	minionList = {
 		"AnimatedWeapon",
 	},
@@ -329,6 +325,9 @@ skills["AnimateWeaponAltX"] = {
 		minion = true,
 		duration = true,
 	},
+	baseMods = {
+		skill("minionUseMainHandWeapon", true),
+	},
 	qualityStats = {
 		Default = {
 			{ "base_number_of_animated_weapons_allowed", 0.05 },
diff --git a/src/Export/Skills/act_dex.txt b/src/Export/Skills/act_dex.txt
index f04cab31b9..e096ed7df8 100644
--- a/src/Export/Skills/act_dex.txt
+++ b/src/Export/Skills/act_dex.txt
@@ -70,10 +70,6 @@ local skills, mod, flag, skill = ...
 
 #skill AnimateWeaponAltX
 #flags spell minion duration
-	minionHasItemSet = true,
-	minionUses = {
-		["Weapon 1"] = true,
-	},
 	minionList = {
 		"AnimatedWeapon",
 	},
@@ -82,6 +78,7 @@ local skills, mod, flag, skill = ...
 			mod("Multiplier:AnimatedWeapon", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true })
 		},
 	},
+#baseMod skill("minionUseMainHandWeapon", true)
 #mods
 
 #skill AnimateWeaponAltY
diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua
index cfa9a6d197..4564dc1519 100644
--- a/src/Modules/CalcActiveSkill.lua
+++ b/src/Modules/CalcActiveSkill.lua
@@ -722,7 +722,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 				activeEffect.srcInstance.skillMinionItemSetCalcs = nil
 				activeEffect.srcInstance.skillMinionItemSet = nil
 			end
-			if activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.type == "Bow" then
+			if (activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.type == "Bow") or activeSkill.skillData.minionUseMainHandWeapon then
 				minion.weaponData1 = env.player.weaponData1
 			elseif env.theIronMass and minionType == "RaisedSkeleton" then
 				minion.weaponData1 = env.player.weaponData1