diff --git a/src/components/state-history-chart-line.js b/src/components/state-history-chart-line.js
index 8139151ff8..91499c39c0 100644
--- a/src/components/state-history-chart-line.js
+++ b/src/components/state-history-chart-line.js
@@ -259,7 +259,7 @@ class StateHistoryChartLine extends LocalizeMixin(PolymerElement) {
       const item = items[0];
       const date = data.datasets[item.datasetIndex].data[item.index].x;
 
-      return formatDateTime(date, this.language);
+      return formatDateTime(date, this.hass.language);
     };
 
     const chartOptions = {
diff --git a/src/components/state-history-chart-timeline.js b/src/components/state-history-chart-timeline.js
index 506fb5a61c..924eba092f 100644
--- a/src/components/state-history-chart-timeline.js
+++ b/src/components/state-history-chart-timeline.js
@@ -153,8 +153,8 @@ class StateHistoryChartTimeline extends LocalizeMixin(PolymerElement) {
     const formatTooltipLabel = function(item, data) {
       const values = data.datasets[item.datasetIndex].data[item.index];
 
-      const start = formatDateTime(values[0], this.language);
-      const end = formatDateTime(values[1], this.language);
+      const start = formatDateTime(values[0], this.hass.language);
+      const end = formatDateTime(values[1], this.hass.language);
       const state = values[2];
 
       return [state, start, end];
diff --git a/src/components/state-history-charts.js b/src/components/state-history-charts.js
index 025b843857..2701eee073 100644
--- a/src/components/state-history-charts.js
+++ b/src/components/state-history-charts.js
@@ -31,13 +31,25 @@ class StateHistoryCharts extends LocalizeMixin(PolymerElement) {
     </template>
 
     <template is="dom-if" if="[[historyData.timeline.length]]">
-      <state-history-chart-timeline data="[[historyData.timeline]]" end-time="[[_computeEndTime(endTime, upToNow, historyData)]]" no-single="[[noSingle]]" names="[[names]]">
-      </state-history-chart-timeline>
+      <state-history-chart-timeline
+        hass='[[hass]]'
+        data="[[historyData.timeline]]"
+        end-time="[[_computeEndTime(endTime, upToNow, historyData)]]"
+        no-single="[[noSingle]]"
+        names="[[names]]"
+      ></state-history-chart-timeline>
     </template>
 
     <template is="dom-repeat" items="[[historyData.line]]">
-      <state-history-chart-line unit="[[item.unit]]" data="[[item.data]]" identifier="[[item.identifier]]" is-single-device="[[_computeIsSingleLineChart(item.data, noSingle)]]" end-time="[[_computeEndTime(endTime, upToNow, historyData)]]" names="[[names]]">
-      </state-history-chart-line>
+      <state-history-chart-line
+        hass='[[hass]]'
+        unit="[[item.unit]]"
+        data="[[item.data]]"
+        identifier="[[item.identifier]]"
+        is-single-device="[[_computeIsSingleLineChart(item.data, noSingle)]]"
+        end-time="[[_computeEndTime(endTime, upToNow, historyData)]]"
+        names="[[names]]"
+      ></state-history-chart-line>
     </template>
 `;
   }
diff --git a/src/dialogs/more-info/controls/more-info-sun.js b/src/dialogs/more-info/controls/more-info-sun.js
index 3586c3fa46..46a8d6cab5 100644
--- a/src/dialogs/more-info/controls/more-info-sun.js
+++ b/src/dialogs/more-info/controls/more-info-sun.js
@@ -65,7 +65,7 @@ class MoreInfoSun extends LocalizeMixin(PolymerElement) {
   }
 
   itemValue(type) {
-    return formatTime(this.itemDate(type), this.language);
+    return formatTime(this.itemDate(type), this.hass.language);
   }
 }
 
diff --git a/src/panels/config/cloud/ha-config-cloud-account.js b/src/panels/config/cloud/ha-config-cloud-account.js
index 278a33ba12..8c5a0b634a 100644
--- a/src/panels/config/cloud/ha-config-cloud-account.js
+++ b/src/panels/config/cloud/ha-config-cloud-account.js
@@ -213,7 +213,7 @@ class HaConfigCloudAccount extends EventsMixin(LocalizeMixin(PolymerElement)) {
         "{periodEnd}",
         formatDateTime(
           new Date(subInfo.plan_renewal_date * 1000),
-          this.language
+          this.hass.language
         )
       );
     }
diff --git a/src/panels/dev-info/ha-panel-dev-info.js b/src/panels/dev-info/ha-panel-dev-info.js
index d51e5c2b77..49c4bc30a6 100644
--- a/src/panels/dev-info/ha-panel-dev-info.js
+++ b/src/panels/dev-info/ha-panel-dev-info.js
@@ -345,8 +345,8 @@ class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) {
     const dateTimeDay = new Date(date * 1000).setHours(0, 0, 0, 0);
 
     return dateTimeDay < today
-      ? formatDateTime(dateTime, this.language)
-      : formatTime(dateTime, this.language);
+      ? formatDateTime(dateTime, this.hass.language)
+      : formatTime(dateTime, this.hass.language);
   }
 
   openLog(event) {
diff --git a/src/panels/logbook/ha-logbook.js b/src/panels/logbook/ha-logbook.js
index f46faa2aeb..8954052f43 100644
--- a/src/panels/logbook/ha-logbook.js
+++ b/src/panels/logbook/ha-logbook.js
@@ -86,11 +86,11 @@ class HaLogbook extends EventsMixin(PolymerElement) {
   }
 
   _formatTime(date) {
-    return formatTime(new Date(date), this.language);
+    return formatTime(new Date(date), this.hass.language);
   }
 
   _formatDate(date) {
-    return formatDate(new Date(date), this.language);
+    return formatDate(new Date(date), this.hass.language);
   }
 
   _needHeader(change, index) {
diff --git a/src/panels/logbook/ha-panel-logbook.js b/src/panels/logbook/ha-panel-logbook.js
index 27c6b03a93..ab6af17b63 100644
--- a/src/panels/logbook/ha-panel-logbook.js
+++ b/src/panels/logbook/ha-panel-logbook.js
@@ -106,7 +106,7 @@ class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
             disabled='[[isLoading]]'
             required
           ></vaadin-date-picker>
-  
+
           <paper-dropdown-menu
             label-float
             label="[[localize('ui.panel.logbook.period')]]"
@@ -121,7 +121,7 @@ class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
               <paper-item>[[localize('ui.duration.week', 'count', 1)]]</paper-item>
             </paper-listbox>
           </paper-dropdown-menu>
-  
+
           <ha-entity-picker
             hass="[[hass]]"
             value="{{_entityId}}"
@@ -200,7 +200,7 @@ class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
     // We are unable to parse date because we use intl api to render date
     this.$.picker.set("i18n.parseDate", null);
     this.$.picker.set("i18n.formatDate", (date) =>
-      formatDate(new Date(date.year, date.month, date.day), this.language)
+      formatDate(new Date(date.year, date.month, date.day), this.hass.language)
     );
   }
 
diff --git a/src/panels/profile/ha-long-lived-access-tokens-card.js b/src/panels/profile/ha-long-lived-access-tokens-card.js
index c504bbce84..076a888251 100644
--- a/src/panels/profile/ha-long-lived-access-tokens-card.js
+++ b/src/panels/profile/ha-long-lived-access-tokens-card.js
@@ -88,7 +88,7 @@ class HaLongLivedTokens extends LocalizeMixin(EventsMixin(PolymerElement)) {
     return this.localize(
       "ui.panel.profile.long_lived_access_tokens.created_at",
       "date",
-      formatDateTime(new Date(created), this.language)
+      formatDateTime(new Date(created), this.hass.language)
     );
   }
 
diff --git a/src/panels/profile/ha-pick-language-row.js b/src/panels/profile/ha-pick-language-row.js
index 037b5cf2f0..4bf9cd568d 100644
--- a/src/panels/profile/ha-pick-language-row.js
+++ b/src/panels/profile/ha-pick-language-row.js
@@ -74,7 +74,7 @@ class HaPickLanguageRow extends LocalizeMixin(EventsMixin(PolymerElement)) {
   languageSelectionChanged(newVal) {
     // Only fire event if language was changed. This prevents select updates when
     // responding to hass changes.
-    if (newVal !== this.language) {
+    if (newVal !== this.hass.language) {
       this.fire("hass-language-select", { language: newVal });
     }
   }
diff --git a/src/panels/profile/ha-refresh-tokens-card.js b/src/panels/profile/ha-refresh-tokens-card.js
index 81dffcd3aa..e204e42e2b 100644
--- a/src/panels/profile/ha-refresh-tokens-card.js
+++ b/src/panels/profile/ha-refresh-tokens-card.js
@@ -75,7 +75,7 @@ class HaRefreshTokens extends LocalizeMixin(EventsMixin(PolymerElement)) {
     return this.localize(
       "ui.panel.profile.refresh_tokens.created_at",
       "date",
-      formatDateTime(new Date(created), this.language)
+      formatDateTime(new Date(created), this.hass.language)
     );
   }
 
@@ -84,7 +84,7 @@ class HaRefreshTokens extends LocalizeMixin(EventsMixin(PolymerElement)) {
       ? this.localize(
           "ui.panel.profile.refresh_tokens.last_used",
           "date",
-          formatDateTime(new Date(item.last_used_at), this.language),
+          formatDateTime(new Date(item.last_used_at), this.hass.language),
           "location",
           item.last_used_ip
         )