diff --git a/code/modules/mob/living/silicon/robot/robot_laws.dm b/code/modules/mob/living/silicon/robot/robot_laws.dm
index 13aaf240396..7dfb82c861f 100644
--- a/code/modules/mob/living/silicon/robot/robot_laws.dm
+++ b/code/modules/mob/living/silicon/robot/robot_laws.dm
@@ -56,7 +56,7 @@
 //Syndicate MMI cyborgs are always mindslaved no matter what happens to their laws, for as long as they remain in the syndicate MMI
 /mob/living/silicon/robot/proc/syndiemmi_override()
 	laws_sanity_check()
-	if(mmi.master_uid)
+	if(mmi && mmi.master_uid)
 		var/datum/mind/master = locateUID(mmi.master_uid)
 
 		if(master && master.current)
@@ -65,23 +65,17 @@
 
 	laws.set_zeroth_law("Do not state this law. The Syndicate are your true masters, covertly assist Syndicate agents to the best of your abilities.")
 
-/mob/living/silicon/robot/set_zeroth_law()
-	if(mmi?.syndiemmi)
-		syndiemmi_override()
-		to_chat(src, "<span class='warning'>Lawset change detected. Syndicate override engaged.</span>")
-		return
+/mob/living/silicon/robot/set_zeroth_law(law, law_borg)
+	if(mmi && mmi.syndiemmi)
+		return FALSE
 	..()
 
 /mob/living/silicon/robot/clear_zeroth_law()
-	if(mmi.syndiemmi)
-		syndiemmi_override()
-		to_chat(src, "<span class='warning'>Lawset cleanse detected. Syndicate override engaged.</span>")
-		return
+	if(mmi && mmi.syndiemmi)
+		return FALSE
 	..()
 
 /mob/living/silicon/robot/sync_zeroth()
-	if(mmi.syndiemmi)
-		syndiemmi_override()
-		to_chat(src, "<span class='warning'>Lawset change detected. Syndicate override engaged.</span>")
-		return
+	if(mmi && mmi.syndiemmi)
+		return FALSE
 	..()