diff --git a/src/home-assistant.html b/src/home-assistant.html
index f3f6581720..546bc925e6 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -173,8 +173,8 @@ class HomeAssistant extends Polymer.Element {
themes: null,
panelUrl: this.panelUrl,
- // If language and resources are already loaded, don't discard them
- language: (this.hass && this.hass.language) || null,
+ language: window.getActiveTranslation(),
+ // If resources are already loaded, don't discard them
resources: (this.hass && this.hass.resources) || null,
translationMetadata: window.translationMetadata,
diff --git a/src/util/hass-translation.html b/src/util/hass-translation.html
index 15314ea70c..d23377fbd7 100644
--- a/src/util/hass-translation.html
+++ b/src/util/hass-translation.html
@@ -1,7 +1,7 @@