diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm
index 35be9ba4e87..df47c48c60b 100644
--- a/code/modules/organs/organ_internal.dm
+++ b/code/modules/organs/organ_internal.dm
@@ -125,14 +125,13 @@
 
 			// Damaged liver means some chemicals are very dangerous
 			if(src.damage >= src.min_bruised_damage)
+				var/list/toxins = list("toxin", "plasma", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker")
 				for(var/datum/reagent/R in owner.reagents.reagent_list)
 					// Ethanol and all drinks are bad
 					if(istype(R, /datum/reagent/ethanol))
 						owner.adjustToxLoss(0.1 * process_accuracy)
-
-				// Can't cope with toxins at all
-				for(var/toxin in list("toxin", "plasma", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker"))
-					if(owner.reagents.has_reagent(toxin))
+					// Can't cope with toxins at all
+					if(R.id in toxins)
 						owner.adjustToxLoss(0.3 * process_accuracy)
 
 /datum/organ/internal/kidney