diff --git a/client/src/actions/index.js b/client/src/actions/index.js
index 3e5b38bc..a4da8c9a 100644
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -500,8 +500,7 @@ export const changeLanguageSuccess = createAction('CHANGE_LANGUAGE_SUCCESS');
 export const changeLanguage = lang => async (dispatch) => {
     dispatch(changeLanguageRequest());
     try {
-        const langCode = lang.substring(0, 2);
-        await apiClient.changeLanguage(langCode);
+        await apiClient.changeLanguage(lang);
         dispatch(changeLanguageSuccess());
     } catch (error) {
         dispatch(addErrorToast({ error }));
diff --git a/client/src/components/App/index.js b/client/src/components/App/index.js
index 98c37afa..74bc6960 100644
--- a/client/src/components/App/index.js
+++ b/client/src/components/App/index.js
@@ -39,9 +39,7 @@ class App extends Component {
         const { processing, language } = this.props.dashboard;
 
         if (!processing) {
-            if (!language) {
-                this.props.changeLanguage(i18n.language);
-            } else {
+            if (language) {
                 i18n.changeLanguage(language);
             }
         }