diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index ea083b544fef..eaefdbc7b0d8 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -222,8 +222,6 @@
 				var/datum/ai_laws/L
 				if(M.clockwork)
 					L = new/datum/ai_laws/ratvar
-					spawn(1)
-						ticker.mode.update_servant_icons_added(O.mind)
 				else
 					L = new/datum/ai_laws/syndicate_override
 				O.laws = L
@@ -248,6 +246,12 @@
 			ticker.mode.remove_antag_for_borging(BM.mind)
 			BM.mind.transfer_to(O)
 
+			if(clockwork)
+				O.emagged = 1
+				O.visible_message("<span class='heavy_brass'>[M]'s eyes glow a blazing yellow!</span>", \
+				"<span class='warning'><b>As you serve Ratvar, your onboard camera is not active and your safeties are disabled.</b></span>")
+				ticker.mode.update_servant_icons_added(O.mind)
+
 			if(O.mind && O.mind.special_role)
 				O.mind.store_memory("As a cyborg, you must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.")
 				O << "<span class='userdanger'>You have been robotized!</span>"