diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 72e6ff63314..26ca4af83e8 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -142,7 +142,7 @@
message = uppertext(message)
verb = "yells loudly"
- if(locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs)
+ if((COMIC in mutations) || (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs))
message = "[message]"
returns[1] = message
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 2f44caf161a..3987b709e3e 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -80,9 +80,6 @@ proc/get_radio_key_from_channel(var/channel)
verb = "stammers"
speech_problem_flag = 1
- if(COMIC in mutations)
- message = "[message]"
-
if(!IsVocal())
message = ""
speech_problem_flag = 1