diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 2f2bf34781d9..d0c2878a990b 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -221,6 +221,8 @@
 					O.make_laws()
 
 			ticker.mode.remove_antag_for_borging(BM.mind)
+			if(!istype(M.laws, /datum/ai_laws/ratvar))
+				remove_servant_of_ratvar(BM, TRUE)
 			BM.mind.transfer_to(O)
 
 			if(O.mind && O.mind.special_role)