diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 7162933349d..840b500de01 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -148,6 +148,9 @@
 			if(prob(braindam))
 				message = uppertext(message)
 				verb = "yells loudly"
+	
+	if(locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs)
+		message = "<span class='sans'>[message]</span>"
 
 	returns[1] = message
 	returns[2] = verb
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index a47c123ec4d..c6d0d8e3ee0 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -98,12 +98,6 @@ proc/get_radio_key_from_channel(var/channel)
 
 	else if(COMIC in mutations)
 		message = "<span class='sans'>[message]</span>"
-	
-	else
-		if(ishuman(src))
-			var/mob/living/carbon/human/H = src
-			if(locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in H.internal_organs)
-				message = "<span class='sans'>[message]</span>"
 
 	if(!IsVocal())
 		message = ""