diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm
index cfabddc78de..a2b4fdd9b11 100644
--- a/code/datums/outfits/ert/kataphract.dm
+++ b/code/datums/outfits/ert/kataphract.dm
@@ -61,7 +61,8 @@
 /datum/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H?.wear_mask && H.species.has_organ["phoron reserve tank"])
 		var/obj/item/organ/vaurca/preserve/preserve = H.internal_organs_by_name["phoron reserve tank"]
-		H.internals = preserve
+		H.internal = preserve
+		H.internals.icon_state = "internal1"
 
 	var/uniform_colour = pick("#42b360", "#b68029", "#5574c2")
 	if(H?.w_uniform)
diff --git a/code/datums/outfits/ert/tcfl.dm b/code/datums/outfits/ert/tcfl.dm
index 2209c0253cf..9666e84a154 100644
--- a/code/datums/outfits/ert/tcfl.dm
+++ b/code/datums/outfits/ert/tcfl.dm
@@ -6,12 +6,20 @@
 	l_ear = /obj/item/device/radio/headset/legion
 	shoes = /obj/item/clothing/shoes/swat/ert
 	gloves = /obj/item/clothing/gloves/swat/ert
-	glasses =  /obj/item/clothing/glasses/sunglasses/aviator
+	glasses = /obj/item/clothing/glasses/sunglasses/aviator
 	back = /obj/item/storage/backpack/legion
 	id = /obj/item/card/id/distress/legion
 
 	backpack_contents = null
 
+/datum/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	. = ..()
+	if(isvaurca(H))
+		H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
+		var/obj/item/organ/vaurca/preserve/preserve = H.internal_organs_by_name["phoron reserve tank"]
+		H.internal = preserve
+		H.internals.icon_state = "internal1"
+
 /datum/outfit/admin/ert/legion/get_id_access()
 	return get_distress_access()
 
diff --git a/code/modules/ghostroles/spawner/human/kataphract.dm b/code/modules/ghostroles/spawner/human/kataphract.dm
index b95bf124ebd..872d2e7df28 100644
--- a/code/modules/ghostroles/spawner/human/kataphract.dm
+++ b/code/modules/ghostroles/spawner/human/kataphract.dm
@@ -124,7 +124,8 @@
 /datum/outfit/admin/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H?.wear_mask && H.species.has_organ["phoron reserve tank"])
 		var/obj/item/organ/vaurca/preserve/preserve = H.internal_organs_by_name["phoron reserve tank"]
-		H.internals = preserve
+		H.internal = preserve
+		H.internals.icon_state = "internal1"
 
 	var/uniform_colour = pick("#1f8c3c", "#ab7318", "#1846ba")
 	if(H?.w_uniform)
diff --git a/html/changelogs/geeves-vaurca_mask.yml b/html/changelogs/geeves-vaurca_mask.yml
new file mode 100644
index 00000000000..f17e8ec3d75
--- /dev/null
+++ b/html/changelogs/geeves-vaurca_mask.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "TCFL vaurca now spawn with filter ports."
+  - bugfix: "Kataphract K'lax internals buttons now update correctly."