diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index bba4971acd9..2c5b9375918 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -207,6 +207,7 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/caution/proximity_sign
 	cost = 4
 	job = list("Janitor")
+	surplus = 0
 
 //Medical
 
diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm
index d11ca6eb059..6e57028472e 100644
--- a/code/game/objects/items/weapons/caution.dm
+++ b/code/game/objects/items/weapons/caution.dm
@@ -18,6 +18,8 @@
 		attack_self(mob/user as mob)
 			if(ishuman(user))
 				var/mob/living/carbon/human/H = user
+				if(H.mind.assigned_role != "Janitor")
+					return
 				if(armed)
 					armed = 0
 					to_chat(user, "\blue You disarm \the [src].")