diff --git a/src/panels/profile/ha-pick-language-row.js b/src/panels/profile/ha-pick-language-row.js
index 8f7f5c1970b4..037b5cf2f00c 100644
--- a/src/panels/profile/ha-pick-language-row.js
+++ b/src/panels/profile/ha-pick-language-row.js
@@ -78,6 +78,13 @@ class HaPickLanguageRow extends LocalizeMixin(EventsMixin(PolymerElement)) {
       this.fire("hass-language-select", { language: newVal });
     }
   }
+
+  ready() {
+    super.ready();
+    if (this.hass && this.hass.language) {
+      this.setLanguageSelection(this.hass.language);
+    }
+  }
 }
 
 customElements.define("ha-pick-language-row", HaPickLanguageRow);