diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 892c91faced..190e7f66f50 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -367,11 +367,11 @@ Diagnostic HUDs!
 
 //Borgie battery tracking!
 /mob/living/silicon/robot/proc/diag_hud_set_borgcell()
-	if(cell)
+	if(QDELETED(cell) || (cell.maxcharge == 0))
+		set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
+	else
 		var/chargelvl = (cell.charge/cell.maxcharge)
 		set_hud_image_state(DIAG_BATT_HUD, "hudbatt[RoundDiagBar(chargelvl)]")
-	else
-		set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
 
 //borg-AI shell tracking
 /mob/living/silicon/robot/proc/diag_hud_set_aishell() //Shows if AI is controlling a cyborg via a BORIS module
@@ -400,11 +400,11 @@ Diagnostic HUDs!
 	set_hud_image_state(DIAG_MECH_HUD, "huddiag[RoundDiagBar(atom_integrity/max_integrity)]")
 
 /obj/vehicle/sealed/mecha/proc/diag_hud_set_mechcell()
-	if(cell)
+	if(QDELETED(cell) || (cell.maxcharge == 0))
+		set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
+	else
 		var/chargelvl = cell.charge/cell.maxcharge
 		set_hud_image_state(DIAG_BATT_HUD, "hudbatt[RoundDiagBar(chargelvl)]")
-	else
-		set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
 
 /obj/vehicle/sealed/mecha/proc/diag_hud_set_mechstat()
 	if(!internal_damage)
@@ -471,11 +471,11 @@ Diagnostic HUDs!
 			set_hud_image_state(DIAG_BOT_HUD, "")
 
 /mob/living/simple_animal/bot/mulebot/proc/diag_hud_set_mulebotcell()
-	if(cell)
+	if(QDELETED(cell) || (cell.maxcharge == 0))
+		set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
+	else
 		var/chargelvl = (cell.charge/cell.maxcharge)
 		set_hud_image_state(DIAG_BATT_HUD, "hudbatt[RoundDiagBar(chargelvl)]")
-	else
-		set_hud_image_state(DIAG_STAT_HUD, "hudnobatt")
 
 /*~~~~~~~~~~~~
 	Airlocks!