diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index 9b3f3809e4e..ef19edb4156 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -194,6 +194,7 @@
 		var/mob/living/silicon/ai/ai = usr
 		if (ai.control_disabled)
 			return
+	if (usr:lockcharge) return
 	..()
 
 
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 11fd2a4dc1c..5fb80ae5451 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -194,12 +194,12 @@
 //							message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
 							R.canmove = !R.canmove
 							if (R.lockcharge)
-								R.cell.charge = R.lockcharge
-								R.lockcharge = null
-								R << "Your lockdown has been removed!"
+							//	R.cell.charge = R.lockcharge
+								R.lockcharge = !R.lockcharge
+								R << "Your lockdown has been lifted!"
 							else
-								R.lockcharge = R.cell.charge
-								R.cell.charge = 0
+								R.lockcharge = !R.lockcharge
+						//		R.cell.charge = 0
 								R << "You have been locked down!"
 
 			else