diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 3f624e7358a..43820adbed1 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -28,11 +28,9 @@
 			Stop()
 
 /obj/item/organ/internal/heart/emp_act(intensity)
-	if(emp_proof)
+	if(!is_robotic() || emp_proof)
 		return
-	if(owner && is_robotic())
-		Stop() // In the name of looooove~!
-		owner.visible_message("<span class='danger'>[owner] clutches [owner.p_their()] chest and gasps!</span>","<span class='userdanger'>You clutch your chest in pain!</span>")
+	Stop()
 
 /obj/item/organ/internal/heart/attack_self(mob/user)
 	..()
@@ -49,7 +47,7 @@
 /obj/item/organ/internal/heart/proc/Stop()
 	beating = FALSE
 	update_icon()
-	return 1
+	return TRUE
 
 /obj/item/organ/internal/heart/proc/Restart()
 	beating = TRUE
@@ -142,9 +140,4 @@
 	icon_base = "heart-c"
 	dead_icon = "heart-c-off"
 	origin_tech = "biotech=5"
-	status = ORGAN_ROBOT
-
-/obj/item/organ/internal/heart/cybernetic/emp_act()
-	if(emp_proof)
-		return
-	Stop()
\ No newline at end of file
+	status = ORGAN_ROBOT
\ No newline at end of file
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 6b5f84d09f0..99bc996dce2 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -51,6 +51,12 @@
 	var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
 	var/heat_damage_types = list(BURN = 1)
 
+/obj/item/organ/internal/lungs/emp_act()
+	if(!is_robotic() || emp_proof)
+		return
+	if(owner)
+		owner.LoseBreath(20)
+
 /obj/item/organ/internal/lungs/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0)
 	..()
 	for(var/thing in list("oxy", "tox", "co2", "nitro"))
@@ -343,13 +349,6 @@
 	origin_tech = "biotech=4"
 	status = ORGAN_ROBOT
 
-/obj/item/organ/internal/lungs/cybernetic/emp_act()
-	if(emp_proof)
-		return
-	if(owner)
-		owner.LoseBreath(20)
-
-
 /obj/item/organ/internal/lungs/cybernetic/upgraded
 	name = "upgraded cybernetic lungs"
 	desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon dioxide."
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 3448986040d..d485c3d87ac 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -264,12 +264,11 @@
 /obj/item/organ/internal/emp_act(severity)
 	if(!is_robotic() || emp_proof)
 		return
-	if(is_robotic())
-		switch(severity)
-			if(1)
-				receive_damage(20, 1)
-			if(2)
-				receive_damage(7, 1)
+	switch(severity)
+		if(1)
+			receive_damage(20, 1)
+		if(2)
+			receive_damage(7, 1)
 
 /obj/item/organ/proc/remove(var/mob/living/user,special = 0)
 	if(!istype(owner))