diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index c7f19e600f..f70f8c55bc 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -278,4 +278,4 @@
 #define PULL_PRONE_SLOWDOWN 0.6
 #define HUMAN_CARRY_SLOWDOWN 0
 
-#define TYPING_INDICATOR_TIMEOUT 30 SECONDS
+#define TYPING_INDICATOR_TIMEOUT 10 SECONDS
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index a728d13deb..a6c0792a5d 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -70,7 +70,7 @@
 	next_click = world.time + world.tick_lag
 
 	// Hide typing indicator if we click
-	hide_typing_indicator_auto()
+	clear_typing_indicator()
 
 	if(check_click_intercept(params,A))
 		return
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 271b18f86f..a9c80740a1 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -2,7 +2,7 @@
 	. = ..()
 	update_turf_movespeed(loc)
 	//Hide typing indicator if we move.
-	hide_typing_indicator_auto()
+	clear_typing_indicator()
 
 /mob/living/CanPass(atom/movable/mover, turf/target)
 	if((mover.pass_flags & PASSMOB))