diff --git a/js/languagePickerModel.js b/js/languagePickerModel.js
index f0a550e..e8adfb4 100644
--- a/js/languagePickerModel.js
+++ b/js/languagePickerModel.js
@@ -38,12 +38,12 @@ export default class LanguagePickerModel extends Backbone.Model {
   }
 
   setLanguage(language, { canReset = true } = {}) {
+    if (canReset) this.checkResetOnLanguageChange();
     this.locationId = offlineStorage.get('location') || null;
     Adapt.config.set({
       _activeLanguage: language,
       _defaultDirection: this.getLanguageDetails(language)._direction
     });
-    if (canReset) this.checkResetOnLanguageChange();
   }
 
   checkResetOnLanguageChange() {
diff --git a/js/languagePickerView.js b/js/languagePickerView.js
index f2f1470..af3931d 100644
--- a/js/languagePickerView.js
+++ b/js/languagePickerView.js
@@ -55,6 +55,8 @@ export default class LanguagePickerView extends Backbone.View {
   }
 
   onLanguageClick(event) {
+  if (this._isLanguageChanging) return;
+  this._isLanguageChanging = true;
     this.destroyNavigation();
     const lang = event.currentTarget.value;
     this.model.setLanguage(lang);