diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index f938f0eab1..525bbeac7e 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -288,7 +288,7 @@
 
 /obj/item/weapon/shockpaddles/proc/can_revive(mob/living/carbon/human/H) //This is checked right before attempting to revive
 	var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[O_BRAIN]
-	if(H.should_have_organ(O_BRAIN) && (!brain || brain.defib_timer <= 0 ) )
+	if(H.should_have_organ(O_BRAIN) && (!brain) )	//CHOMPEdit Defib Timer Removal
 		return "buzzes, \"Resuscitation failed - Excessive neural degeneration. Further attempts futile.\""
 
 	H.updatehealth()
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 9047eb2665..7e11c71c77 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -145,8 +145,7 @@ var/list/organ_cache = list()
 	STOP_PROCESSING(SSobj, src)
 	handle_organ_mod_special(TRUE)
 	if(owner && vital)
-		owner.can_defib = 0
-		owner.death()
+		owner.death()	//CHOMPEdit Defib Timer Removal
 
 /obj/item/organ/proc/adjust_germ_level(var/amount)		// Unless you're setting germ level directly to 0, use this proc instead
 	germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX)
@@ -405,8 +404,7 @@ var/list/organ_cache = list()
 			if(user)
 				add_attack_logs(user, owner, "Removed vital organ [src.name]")
 			if(owner.stat != DEAD)
-				owner.can_defib = 0
-				owner.death()
+				owner.death()	//CHOMPEdit Defib Timer Removal
 
 	handle_organ_mod_special(TRUE)