diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index c45985ce..ddec6818 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -652,8 +652,8 @@ export default Vue.extend({
 
     this.currentLocale = this.$i18n.locale
     this.currentGeoLocation = this.$i18n.geoLocation
-    if (this.currentGeoLocation === undefined) {
-      this.updateGeoLocationNames(this.currentLocale)
+    this.updateGeoLocationNames(this.currentLocale)
+    if (this.currentGeoLocation === undefined || this.currentGeoLocation === null) {
       this.currentGeoLocation = 'us'
     }
   },