diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 32bca624bc6..154a7eb5337 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -257,26 +257,21 @@ var/list/organ_cache = list()
 			take_damage(3,0)
 
 /obj/item/organ/internal/emp_act(severity)
-	if(!robotic)
-		return
-	if(ORGAN_ROBOT)
+	if(robotic == ORGAN_ROBOT)
 		switch (severity)
 			if (1.0)
 				take_damage(20,1)
-				return
 			if (2.0)
 				take_damage(7,1)
-				return
 			if(3.0)
 				take_damage(3,1)
-	else if(ORGAN_ASSISTED)
+	else if(robotic == ORGAN_ASSISTED)
 		take_damage(11,1)
 
 /obj/item/organ/internal/heart/emp_act(intensity)
 	if(owner && robotic == 2)
 		owner.heart_attack = 1
 		owner.visible_message("<span class='danger'>[owner] clutches their chest and gasps!</span>","<span class='userdanger'>You clutch your chest in pain!</span>")
-		return
 	else if(owner && robotic == 1)
 		take_damage(11,1)