diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 159134508b..6c7b3031c5 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -19,6 +19,8 @@
 		if(valid)
 			display_typing_indicator()
 	switch(_key)
+		if("Escape")
+			clear_typing_indicator()
 		if("Delete", "H")
 			if(!pulling)
 				to_chat(src, "<span class='notice'>You are not pulling anything.</span>")
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 8b2d9ef0c4..ac5924f6d8 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -3,11 +3,12 @@
 	set name = "Say"
 	set category = "IC"
 	clear_typing_indicator()		// clear it immediately!
+	if(!length(message))
+		return
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
-	if(message)
-		say(message)
+	say(message)
 
 /mob/say_mod(input, message_mode)
 	var/customsayverb = findtext(input, "*")
@@ -21,6 +22,8 @@
 	set name = "Whisper"
 	set category = "IC"
 	clear_typing_indicator()		// clear it immediately!
+	if(!length(message))
+		return
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
@@ -33,6 +36,8 @@
 	set name = "Me"
 	set category = "IC"
 	clear_typing_indicator()		// clear it immediately!
+	if(!length(message))
+		return
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return