diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
index 03a124e306..b864a9fe25 100644
--- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
@@ -12,7 +12,7 @@
 
 /obj/item/gun/energy/pumpaction/emp_act(severity)	//makes it not rack itself when emp'd
 	cell.use(round(cell.charge / severity))
-	chambered = 0 //we empty the chamber
+	chambered = null //we empty the chamber
 	update_icon()
 
 /obj/item/gun/energy/pumpaction/process()	//makes it not rack itself when self-charging
@@ -20,7 +20,7 @@
 		charge_tick++
 		if(charge_tick < charge_delay)
 			return
-		charge_tick = 0
+		charge_tick = null
 		if(selfcharge == EGUN_SELFCHARGE_BORG)
 			var/atom/owner = loc
 			if(istype(owner, /obj/item/robot_module))
@@ -44,7 +44,7 @@
 	if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
 		var/obj/item/ammo_casing/energy/shot = chambered
 		cell.use(shot.e_cost)//... drain the cell cell
-	chambered = 0 //either way, released the prepared shot
+	chambered = null //either way, released the prepared shot
 
 /obj/item/gun/energy/pumpaction/post_set_firemode()
 	var/has_shot = chambered