diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index 298ecd91f7d41a2241e2bdc6a3fb3576b75223de..822d054a9a9eee56f9faf675a568e773f80a0961 100755
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -51,7 +51,10 @@ class IntlStartup extends Component {
         return response.json();
       })
       .then((messages) => {
-        this.setState({ messages }, () => {
+        if (messages.statusCode === 506) {
+          this.setState({ appLocale: 'en' });
+        }
+        this.setState({ messages: messages.messages }, () => {
           baseControls.updateLoadingState(false);
         });
       })
diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js
index a3eb5c198fb1c41ac926fc4e39923ea0812011c7..869fffc72aa6dae48b345c2a4bb91fe4be1b07c4 100755
--- a/bigbluebutton-html5/imports/startup/server/index.js
+++ b/bigbluebutton-html5/imports/startup/server/index.js
@@ -43,8 +43,7 @@ WebApp.connectHandlers.use('/locale', (req, res) => {
   });
 
   res.setHeader('Content-Type', 'application/json');
-  res.writeHead(statusCode);
-  res.end(JSON.stringify(messages));
+  res.end(JSON.stringify({ statusCode, messages }));
 });
 
 WebApp.connectHandlers.use('/locales', (req, res) => {