diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm
index 18f4d1c2094..33c8f736fd8 100644
--- a/code/modules/client/preferences/body_type.dm
+++ b/code/modules/client/preferences/body_type.dm
@@ -10,11 +10,6 @@
 /datum/preference/choiced/body_type/init_possible_values()
 	return list(USE_GENDER, MALE, FEMALE)
 
-/datum/preference/choiced/body_type/is_valid(value, datum/preferences/preferences)
-	. = ..()
-	if(. && value == USE_GENDER)
-		return gender_has_physique(preferences.read_preference(/datum/preference/choiced/gender))
-
 /datum/preference/choiced/body_type/create_informed_default_value(datum/preferences/preferences)
 	return gender_has_physique(preferences.read_preference(/datum/preference/choiced/gender)) ? USE_GENDER : FEMALE
 
diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm
index fb9c38f34b7..1ad7f9ac0d8 100644
--- a/code/modules/client/preferences/gender.dm
+++ b/code/modules/client/preferences/gender.dm
@@ -16,12 +16,3 @@
 	// The only reason I'm limiting this to male or female
 	// is that hairstyle randomization handles enbies poorly
 	return pick(MALE, FEMALE)
-
-/datum/preference/choiced/gender/post_write(value, datum/preferences/preferences)
-	..()
-	if (gender_has_physique(value))
-		return
-
-	var/current_physique = preferences.read_preference(/datum/preference/choiced/body_type)
-	if(current_physique != MALE && current_physique != FEMALE)
-		preferences.update_preference(GLOB.preference_entries[/datum/preference/choiced/body_type], FEMALE)