diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index b03132c15d2b..77d4c211e306 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -211,6 +211,11 @@
 	var/gloves_blood_amt = 0 //taken from blood.dm
 	var/hide_prints = FALSE
 
+/obj/item/clothing/gloves/Initialize(mapload, ...)
+	. = ..()
+	if(armor_melee || armor_bullet || armor_laser || armor_energy || armor_bomb || armor_bio || armor_rad)
+		AddComponent(/datum/component/armor_link, WEAR_JACKET, TRUE)
+
 /obj/item/clothing/gloves/update_clothing_icon()
 	if (ismob(src.loc))
 		var/mob/M = src.loc
@@ -335,6 +340,11 @@
 	var/list/items_allowed
 	var/shoes_blood_amt = 0
 
+	obj/item/clothing/shoes/Initialize(mapload, ...)
+	. = ..()
+	if(armor_melee || armor_bullet || armor_laser || armor_energy || armor_bomb || armor_bio || armor_rad)
+		AddComponent(/datum/component/armor_link, WEAR_JACKET, TRUE)
+
 /obj/item/clothing/shoes/update_clothing_icon()
 	if (ismob(src.loc))
 		var/mob/M = src.loc