diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index 3b55dc1dda3..ffcb3f32e16 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -89,15 +89,20 @@ var/global/list/limb_icon_cache = list()
 
 /obj/item/organ/external/proc/get_icon(var/skeletal)
 
-	var/gender
+	var/gender = "f"
+	if(owner && owner.gender == MALE)
+		gender = "m"
+
 	if(force_icon)
-		mob_icon = new /icon(force_icon, "[icon_name][gendered_icon ? "_f" : ""]")
+		mob_icon = new /icon(force_icon, "[icon_name][gendered_icon ? "_[gender]" : ""]")
 	else
 		if(!dna)
-			mob_icon = new /icon('icons/mob/human_races/r_human.dmi', "[icon_name][gendered_icon ? "_f" : ""]")
+			mob_icon = new /icon('icons/mob/human_races/r_human.dmi', "[icon_name][gendered_icon ? "_[gender]" : ""]")
 		else
 
-			if(gendered_icon)
+			if(!gendered_icon)
+				gender = null
+			else
 				if(dna.GetUIState(DNA_UI_GENDER))
 					gender = "f"
 				else