diff --git a/react/features/conference/components/AbstractInsecureRoomNameLabel.js b/react/features/conference/components/AbstractInsecureRoomNameLabel.js
index c5902790d..5bcd446e2 100644
--- a/react/features/conference/components/AbstractInsecureRoomNameLabel.js
+++ b/react/features/conference/components/AbstractInsecureRoomNameLabel.js
@@ -50,8 +50,9 @@ export default class AbstractInsecureRoomNameLabel extends PureComponent<Props>
  */
 export function _mapStateToProps(state: Object): $Shape<Props> {
     const { room } = state['features/base/conference'];
+    const { enableInsecureRoomNameWarning = false } = state['features/base/config'];
 
     return {
-        _visible: room && isInsecureRoomName(room)
+        _visible: enableInsecureRoomNameWarning && room && isInsecureRoomName(room)
     };
 }
diff --git a/react/features/welcome/components/AbstractWelcomePage.js b/react/features/welcome/components/AbstractWelcomePage.js
index b8e5f1136..acd4a7f18 100644
--- a/react/features/welcome/components/AbstractWelcomePage.js
+++ b/react/features/welcome/components/AbstractWelcomePage.js
@@ -20,6 +20,11 @@ type Props = {
      */
     _calendarEnabled: boolean,
 
+    /**
+     * Whether the insecure room name functionality is enabled or not.
+     */
+    _enableInsecureRoomNameWarning: boolean,
+
     /**
      * Whether the recent list is enabled
      */
@@ -214,7 +219,7 @@ export class AbstractWelcomePage extends Component<Props, *> {
     _onRoomChange(value: string) {
         this.setState({
             room: value,
-            insecureRoomName: value && isInsecureRoomName(value)
+            insecureRoomName: this.props._enableInsecureRoomNameWarning && value && isInsecureRoomName(value)
         });
     }
 
@@ -226,7 +231,7 @@ export class AbstractWelcomePage extends Component<Props, *> {
      * @returns {ReactElement}
      */
     _renderInsecureRoomNameWarning() {
-        if (this.state.insecureRoomName) {
+        if (this.props._enableInsecureRoomNameWarning && this.state.insecureRoomName) {
             return this._doRenderInsecureRoomNameWarning();
         }
 
@@ -273,6 +278,7 @@ export class AbstractWelcomePage extends Component<Props, *> {
 export function _mapStateToProps(state: Object) {
     return {
         _calendarEnabled: isCalendarEnabled(state),
+        _enableInsecureRoomNameWarning: state['features/base/config'].enableInsecureRoomNameWarning || false,
         _recentListEnabled: isRecentListEnabled(),
         _room: state['features/base/conference'].room,
         _settings: state['features/base/settings']