diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index b48bb4edb5d..5a70881851e 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -36,7 +36,9 @@
 	. = ..()
 	STOP_PROCESSING(SSobj, src)
 	if(iszombie(new_owner) && old_species && !special)
-		new_owner.set_species(old_species)
+		// There isn't a clean way to change species during organ or bodypart removals. In lieau of a beter solution, this will do
+		spawn(0)
+			new_owner.set_species(old_species)
 	if(timer_id)
 		deltimer(timer_id)
 	UnregisterSignal(new_owner, COMSIG_LIVING_DEATH)