diff --git a/code/game/say.dm b/code/game/say.dm
index b66c063761..6b923d4e83 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -146,9 +146,12 @@ GLOBAL_LIST_INIT(freqtospan, list(
 	return "[copytext_char("[freq]", 1, 4)].[copytext_char("[freq]", 4, 5)]"
 
 /atom/movable/proc/attach_spans(input, list/spans)
-	var/customsayverb = findtext(input, "*")
-	if(customsayverb)
-		input = capitalize(copytext(input, customsayverb + length(input[customsayverb])))
+	if(input[1] == "!")
+		input = copytext(input, 1, length(input) + 1)
+	else
+		var/customsayverb = findtext(input, "*")
+		if(customsayverb)
+			input = capitalize(copytext(input, customsayverb + length(input[customsayverb])))
 	if(input)
 		return "[message_spans_start(spans)][input]</span>"
 	else