diff --git a/src/Data/Skills/act_str.lua b/src/Data/Skills/act_str.lua
index 87644edd22..23d10619e6 100644
--- a/src/Data/Skills/act_str.lua
+++ b/src/Data/Skills/act_str.lua
@@ -517,14 +517,6 @@ skills["SupportAncestralWarriorTotemPlayer"] = {
 	addSkillTypes = { SkillType.UsedByTotem, },
 	excludeSkillTypes = { SkillType.Meta, SkillType.Triggered, SkillType.Cooldown, SkillType.Channel, SkillType.Persistent, },
 	ignoreMinionTypes = true,
-	weaponTypes = {
-		["One Hand Axe"] = true,
-		["One Hand Mace"] = true,
-		["One Hand Sword"] = true,
-		["Two Hand Axe"] = true,
-		["Two Hand Mace"] = true,
-		["Two Hand Sword"] = true,
-	},
 	qualityStats = {
 	},
 	levels = {
@@ -5292,10 +5284,6 @@ skills["SupportFerociousRoarPlayer"] = {
 	excludeSkillTypes = { SkillType.Meta, SkillType.InbuiltTrigger, SkillType.Shapeshift, },
 	isTrigger = true,
 	ignoreMinionTypes = true,
-	weaponTypes = {
-		["Bow"] = true,
-		["Spear"] = true,
-	},
 	qualityStats = {
 		{ "warcry_grant_damage_+%_to_exerted_attacks", 1.5 },
 	},
diff --git a/src/Data/Skills/sup_str.lua b/src/Data/Skills/sup_str.lua
index bb06cbdb01..29b4d9390f 100644
--- a/src/Data/Skills/sup_str.lua
+++ b/src/Data/Skills/sup_str.lua
@@ -6629,9 +6629,6 @@ skills["SupportStompingGroundPlayer"] = {
 	addSkillTypes = { },
 	excludeSkillTypes = { },
 	gemFamily = { "StompingGround",},
-	weaponTypes = {
-		["Two Hand Mace"] = true,
-	},
 	levels = {
 		[1] = { levelRequirement = 0, },
 	},
diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua
index 018ca08f31..1b08ecbb2f 100644
--- a/src/Export/Scripts/skills.lua
+++ b/src/Export/Scripts/skills.lua
@@ -358,7 +358,7 @@ directiveTable.skill = function(state, args, out)
 			out:write('\tignoreMinionTypes = true,\n')
 		end
 		local weaponTypes = { }
-		if granted.WeaponRestrictions[1] then
+		if granted.WeaponRestrictions[1] and not granted.IsSupport then
 			for _, class in ipairs(granted.WeaponRestrictions[1].WeaponClass) do
 				if weaponClassMap[class.ItemClass.Id] then
 					weaponTypes[weaponClassMap[class.ItemClass.Id]] = true