diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 8ae2906fa5f..81ad1f2f4c9 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -57,7 +57,12 @@
 			status = 0
 			update_icon()
 		if(status)
-			bcell.use(losspertick)
+			if(isrobot(loc))
+				var/mob/living/silicon/robot/R = loc
+				if(R && R.cell)
+					R.cell.use(losspertick)
+			else
+				bcell.use(losspertick)
 			update_icon()
 
 /obj/item/weapon/melee/baton/update_icon()