diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 22cb6933cda..58ed8163a14 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -524,11 +524,14 @@ Note that amputating the affected organ does in fact remove the infection from t
 			return null
 
 /obj/item/organ/external/chest/droplimb()
-	if(!owner || !hasorgans(src))
+	if(!owner)
 		return
 
 	var/mob/living/carbon/C = owner
 
+	if(!hasorgans(C))
+		return
+
 	var/organ_spilled = FALSE
 	var/turf/T = get_turf(C)
 	C.add_splatter_floor(T)
@@ -546,11 +549,14 @@ Note that amputating the affected organ does in fact remove the infection from t
 	return TRUE
 
 /obj/item/organ/external/groin/droplimb()
-	if(!owner || !hasorgans(src))
+	if(!owner)
 		return
 
 	var/mob/living/carbon/C = owner
 
+	if(!hasorgans(C))
+		return
+
 	var/organ_spilled = FALSE
 	var/turf/T = get_turf(C)
 	C.add_splatter_floor(T)