diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 8f703a4fd0d..2cff5db4028 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -157,6 +157,10 @@
 			src.occupant.toxloss = max (src.occupant.toxloss-1, 0)
 			src.occupant.bruteloss = max (src.occupant.bruteloss-1, 0)
 			sleep(10)
+			if (src.occupant.health <= 0 && src.occupant.stat == 2)
+				src.occupant.stat = 0
+				src.overlays -= image('AIcore.dmi', "ai-fixer-404")
+				src.overlays += image('AIcore.dmi', "ai-fixer-full")
 		src.active = 0
 		src.overlays -= image('AIcore.dmi', "ai-fixer-on")
 
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 20d54e41924..02e25788a15 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -26,10 +26,10 @@
 				src.fire.icon_state = "fire0"
 		*/ //TODO: DEFERRED
 
-		if (src.health <= -100.0 && !istype(src.loc, /obj/machinery/computer/aifixer))
+		if (src.health <= -100.0)
 			death()
 			return
-		else if (src.health < 0 && !istype(src.loc, /obj/machinery/computer/aifixer))
+		else if (src.health < 0)
 			src.oxyloss++
 
 		if (src.machine)