diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 39dc37e5be..ef3ae63e88 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -648,7 +648,7 @@ bool LLNearbyChat::isChatMultiTab()
 
 void LLNearbyChat::setDocked(bool docked, bool pop_on_undock)
 {
-	if(!isChatMultiTab())
+	if((!isChatMultiTab()) && gSavedSettings.getBOOL("ChatHistoryTornOff"))
 	{
 		LLDockableFloater::setDocked(docked, pop_on_undock);
 	}