diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index 8f284467560ce475b33cceb3f05589d6986c1a16..6544107eacddb713db4962e7f4c5d71e607865e8 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -138,6 +138,7 @@ class IntlStartup extends Component {
       messages: {},
       normalizedLocale: null,
       fetching: true,
+      init: true,
     };
 
     if (RTL_LANGUAGES.includes(props.locale)) {
@@ -153,14 +154,20 @@ class IntlStartup extends Component {
   }
 
   componentDidUpdate() {
-    const { fetching, normalizedLocale } = this.state;
+    const { fetching, normalizedLocale, init } = this.state;
     const { locale } = this.props;
 
     if (!fetching
       && normalizedLocale
-      && locale.toLowerCase() !== normalizedLocale.toLowerCase()) {
+      && ((locale.toLowerCase() !== normalizedLocale.toLowerCase())
+      && (!init && (DEFAULT_LANGUAGE && normalizedLocale.toLowerCase())))) {
       this.fetchLocalizedMessages(locale);
     }
+    if (init && !normalizedLocale) {
+      this.setState({
+        init: false,
+      });
+    }
   }
 
   fetchLocalizedMessages(locale, init = false) {