diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 83a0e1864d6..d85db87608c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -44,6 +44,9 @@
 	return 1
 
 /obj/item/clothing/proc/refit_for_species(var/target_species)
+	if(!species_restricted)
+		return //this item doesn't use the species_restricted system
+
 	//Set species_restricted list
 	switch(target_species)
 		if("Human", "Skrell")	//humanoid bodytypes
@@ -63,6 +66,9 @@
 		icon = initial(icon)
 
 /obj/item/clothing/head/helmet/refit_for_species(var/target_species)
+	if(!species_restricted)
+		return //this item doesn't use the species_restricted system
+	
 	//Set species_restricted list
 	switch(target_species)
 		if("Skrell")
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index a1e6ab27142..2c5b9f2378f 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -55,6 +55,13 @@
 	var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any.
 	var/obj/item/clothing/head/helmet/helmet = null   // Deployable helmet, if any.
 
+/obj/item/clothing/suit/space/void/refit_for_species(var/target_species)
+	..()
+	if(istype(helmet))
+		helmet.refit_for_species(target_species)
+	if(istype(boots))
+		boots.refit_for_species(target_species)
+
 /obj/item/clothing/suit/space/void/equipped(mob/M)
 	..()