diff --git a/code/__HELPERS/custom_holoforms.dm b/code/__HELPERS/custom_holoforms.dm
index 08413b1614..34b31cc1c7 100644
--- a/code/__HELPERS/custom_holoforms.dm
+++ b/code/__HELPERS/custom_holoforms.dm
@@ -62,6 +62,9 @@
 					characters[name] = i
 			var/chosen_name = input(C, "Which character do you wish to use as your appearance.") as anything in characters
 			if(chosen_name)
+				if(C.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+					to_chat(C.mob, "<span class='boldwarning'>You are attempting to set your custom holoform too fast!</span>")
+					return
 				target_prefs = new(C)
 				if(!target_prefs.load_character(characters[chosen_name], TRUE))
 					target_prefs = C.prefs
diff --git a/code/modules/mob/living/silicon/custom_holoform.dm b/code/modules/mob/living/silicon/custom_holoform.dm
index 0e0af7e308..38cb4b7b2a 100644
--- a/code/modules/mob/living/silicon/custom_holoform.dm
+++ b/code/modules/mob/living/silicon/custom_holoform.dm
@@ -2,9 +2,6 @@
 	if(!client.prefs)
 		to_chat(src, "<span class='boldwarning'>No preferences datum on your client, contact an admin/coder!</span>")
 		return
-	if(client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
-		to_chat(src, "<span class='warning'>You are attempting to change custom holoforms too fast!</span>")
-		return
 	client.prefs.last_custom_holoform = world.time
 	var/icon/new_holoform = user_interface_custom_holoform(client)
 	if(new_holoform)