diff --git a/code/modules/language/_language.dm b/code/modules/language/_language.dm
index eda32fc68e3..53b4cbdb44e 100644
--- a/code/modules/language/_language.dm
+++ b/code/modules/language/_language.dm
@@ -61,7 +61,7 @@
 
 /// Simple helper for getting a default firstname lastname
 /datum/language/proc/default_name(gender = NEUTER)
-	if(gender != MALE)
+	if(gender != MALE && gender != FEMALE)
 		gender = pick(MALE, FEMALE)
 	if(gender == FEMALE)
 		return capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
diff --git a/code/modules/language/draconic.dm b/code/modules/language/draconic.dm
index 55ebd1ec202..f61bbef009e 100644
--- a/code/modules/language/draconic.dm
+++ b/code/modules/language/draconic.dm
@@ -29,7 +29,7 @@
 )
 	if(force_use_syllables)
 		return ..()
-	if(gender != MALE)
+	if(gender != MALE && gender != FEMALE)
 		gender = pick(MALE, FEMALE)
 
 	if(gender == MALE)