diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index c2aca6807ea..dd175b95eb6 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -30,6 +30,11 @@
 	R.uneq_all()
 	R.hands.icon_state = "nomod"
 	R.icon_state = "robot"
+	world << R.custom_sprite
+	if(R.custom_sprite == 1)
+		world << R.icon_state
+		icon = 'icons/mob/custom-synthetic.dmi'
+		R.icon_state = "[R.ckey]-Standard"
 	del(R.module)
 	R.module = null
 	R.camera.network.Remove(list("Engineering","Medical","MINE"))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index f906ee4db46..45d2d88371e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -10,7 +10,7 @@
 	var/custom_name = ""
 	var/custom_sprite = 0 //Due to all the sprites involved, a var for our custom borgs may be best
 	var/crisis //Admin-settable for combat module use.
-	var/crisis_override
+	var/crisis_override = 0
 
 //Hud stuff
 
diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm
index 924771a5d45..71f22a3029f 100644
--- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm
+++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm
@@ -33,8 +33,6 @@
 	R.hands.icon_state = "nomod"
 	R.base_icon = "robot"
 	R.icon_state = "robot"
-	if(R.custom_sprite == 1)
-		R.icon_state = "[src.ckey]-Standard"
 	R.updateicon()
 	R.languages = list()
 	R.speech_synthesizer_langs = list()