diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index 4cfa52cc45..e01f738066 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -73,8 +73,10 @@
 			if(!(path in negative_traits))
 				pref.neg_traits -= path
 
-	if(!pref.custom_base || !(pref.custom_base in custom_species_bases))
-		pref.custom_base = "Human"
+	if(pref.species == pref.custom_base && pref.species != SPECIES_CUSTOM)
+		// Allowed!
+	else if(!pref.custom_base || !(pref.custom_base in custom_species_bases))
+		pref.custom_base = SPECIES_HUMAN
 
 /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character)
 	character.custom_species	= pref.custom_species
@@ -148,8 +150,11 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["custom_base"])
-		var/text_choice = input("Pick an icon set for your species:","Icon Base") in custom_species_bases
-		if(text_choice in custom_species_bases)
+		var/list/choices = custom_species_bases
+		if(pref.species != SPECIES_CUSTOM)
+			choices = (choices | pref.species)
+		var/text_choice = input("Pick an icon set for your species:","Icon Base") in choices
+		if(text_choice in choices)
 			pref.custom_base = text_choice
 		return TOPIC_REFRESH_UPDATE_PREVIEW