diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index 75b9c0e052..4dc711fbe6 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -96,6 +96,13 @@ public:
         {
             ctrl->getSignal()->connect(boost::bind(&LLFloaterIMNearbyChatScreenChannel::updateToastFadingTime, this));
         }
+        // <FS:darl> [FIRE-35039 > FIRE-35294] Add flag to show/hide the on-screen console
+        ctrl = gSavedSettings.getControl("FSShowOnscreenConsole").get();
+        if (ctrl)
+        {
+            ctrl->getSignal()->connect(boost::bind(&LLFloaterIMNearbyChatScreenChannel::removeToastsFromChannel, this));
+        }
+        // </FS:darl> [FIRE-35039 > FIRE-35294] Add flag to show/hide the on-screen console
     }
 
     void addChat    (LLSD& chat);
@@ -694,6 +701,14 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
     }
     // </FS:Ansariel>
 
+    // <FS:darl> [FIRE-35039 > FIRE-35294] Add flag to show/hide the on-screen console
+    static LLUICachedControl<bool> showOnscreenConsole("FSShowOnscreenConsole");
+    if (!showOnscreenConsole)
+    {
+        return;
+    }
+    // </FS:darl> [FIRE-35039 > FIRE-35294]
+
     static LLCachedControl<bool> useChatBubbles(gSavedSettings, "UseChatBubbles");
     static LLCachedControl<bool> fsBubblesHideConsoleAndToasts(gSavedSettings, "FSBubblesHideConsoleAndToasts");
     // <FS:Ansariel> [FS communication UI]