diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index aeffc39c2..87b1e4f99 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2015,10 +2015,10 @@ void LLAgent::startTyping()
 //-----------------------------------------------------------------------------
 void LLAgent::stopTyping()
 {
-	LLFloaterAO::typing(false); // Singu Note: Typing anims handled by AO/settings.
 	if (mRenderState & AGENT_STATE_TYPING)
 	{
 		clearRenderState(AGENT_STATE_TYPING);
+		LLFloaterAO::typing(false); // Singu Note: Typing anims handled by AO/settings.
 		gChatBar->
 				sendChatFromViewer("", CHAT_TYPE_STOP, FALSE);
 	}