diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index 6aa7431f39a2dd5d297c70698c011f8804a2fbd4..a1989147dde3cf5832ce92aac28f6527dee48c47 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -106,7 +106,7 @@ class IntlStartup extends Component {
 
   componentWillMount() {
     const { locale } = this.props;
-    this.fetchLocalizedMessages(locale);
+    this.fetchLocalizedMessages(locale, true);
   }
 
   componentWillUpdate(nextProps) {
@@ -120,8 +120,8 @@ class IntlStartup extends Component {
     }
   }
 
-  fetchLocalizedMessages(locale) {
-    const url = `/html5client/locale?locale=${locale}`;
+  fetchLocalizedMessages(locale, init = false) {
+    const url = `/html5client/locale?locale=${locale}&init=${init}`;
 
     this.setState({ fetching: true }, () => {
       fetch(url)
diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js
index 119027be1e5d2c443f77b6071bb3b5c9f445b662..2f6cc43f7436903dac29fdf33fb7001a6dc40f38 100755
--- a/bigbluebutton-html5/imports/startup/server/index.js
+++ b/bigbluebutton-html5/imports/startup/server/index.js
@@ -108,7 +108,9 @@ WebApp.connectHandlers.use('/locale', (req, res) => {
   const APP_CONFIG = Meteor.settings.public.app;
   const fallback = APP_CONFIG.defaultSettings.application.fallbackLocale;
   const override = APP_CONFIG.defaultSettings.application.overrideLocale;
-  const browserLocale = override ? override.split(/[-_]/g) : req.query.locale.split(/[-_]/g);
+  const browserLocale = override && req.query.init === 'true'
+    ? override.split(/[-_]/g) : req.query.locale.split(/[-_]/g);
+
   const localeList = [fallback];
 
   const usableLocales = AVAILABLE_LOCALES