diff --git a/config.js b/config.js
index 0228eaf00..b1d853c01 100644
--- a/config.js
+++ b/config.js
@@ -340,6 +340,9 @@ var config = {
     // UI
     //
 
+    // Hides lobby button
+    // hideLobbyButton: false,
+
     // Require users to always specify a display name.
     // requireDisplayName: true,
 
diff --git a/react/features/connection-stats/components/ConnectionStatsTable.js b/react/features/connection-stats/components/ConnectionStatsTable.js
index b8c3bfd77..5a454e978 100644
--- a/react/features/connection-stats/components/ConnectionStatsTable.js
+++ b/react/features/connection-stats/components/ConnectionStatsTable.js
@@ -226,7 +226,7 @@ class ConnectionStatsTable extends Component<Props> {
 
     /**
      * Creates a a table row as a ReactElement for displaying codec, if present.
-     * This will typically be something like "Codecs (A/V): opus, vp8".
+     * This will typically be something like "Codecs (A/V): Opus, vp8".
      *
      * @private
      * @returns {ReactElement}
diff --git a/react/features/lobby/components/native/LobbyModeButton.js b/react/features/lobby/components/native/LobbyModeButton.js
index 8faeaffa2..97018d2ea 100644
--- a/react/features/lobby/components/native/LobbyModeButton.js
+++ b/react/features/lobby/components/native/LobbyModeButton.js
@@ -66,11 +66,12 @@ class LobbyModeButton extends AbstractButton<Props, any> {
 export function _mapStateToProps(state: Object): $Shape<Props> {
     const conference = getCurrentConference(state);
     const { lobbyEnabled } = state['features/lobby'];
+    const { hideLobbyButton } = state['features/base/config'];
     const lobbySupported = conference && conference.isLobbySupported();
 
     return {
         lobbyEnabled,
-        visible: lobbySupported && isLocalParticipantModerator(state)
+        visible: lobbySupported && isLocalParticipantModerator(state) && !hideLobbyButton
     };
 }
 
diff --git a/react/features/lobby/components/web/LobbySection.js b/react/features/lobby/components/web/LobbySection.js
index 64a66359e..a67d18bf6 100644
--- a/react/features/lobby/components/web/LobbySection.js
+++ b/react/features/lobby/components/web/LobbySection.js
@@ -132,10 +132,12 @@ class LobbySection extends PureComponent<Props, State> {
  */
 function mapStateToProps(state: Object): $Shape<Props> {
     const { conference } = state['features/base/conference'];
+    const { hideLobbyButton } = state['features/base/config'];
 
     return {
         _lobbyEnabled: state['features/lobby'].lobbyEnabled,
         _visible: conference && conference.isLobbySupported() && isLocalParticipantModerator(state)
+            && !hideLobbyButton
     };
 }