diff --git a/indra/newview/llnearbychatbarlistener.cpp b/indra/newview/llnearbychatbarlistener.cpp
index 2249aa594d..3b748caadc 100644
--- a/indra/newview/llnearbychatbarlistener.cpp
+++ b/indra/newview/llnearbychatbarlistener.cpp
@@ -36,6 +36,7 @@
 
 #include "llagent.h"
 #include "llchat.h"
+#include "llviewercontrol.h"
 
 
 // <FS:Zi> Remove floating chat bar
@@ -104,7 +105,7 @@ void LLNearbyChatBarListener::sendChat(LLSD const & chat_data) const
 	// Send it as if it was typed in
 	// <FS:Zi> Remove floating chat bar
 	// mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0));
-	LLNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0));
+	LLNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, ((BOOL)(channel == 0)) && gSavedSettings.getBOOL("FSPlayChatAnimation"));
 	// <FS:Zi>
 }