From e9f4307d15f4fc1a096373ec46fc952f5f5596d1 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 14 Sep 2022 09:02:51 +0200
Subject: [PATCH] Fix hass subpage (#13730)

---
 src/layouts/hass-subpage.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/layouts/hass-subpage.ts b/src/layouts/hass-subpage.ts
index 2dd0979543..76322b6691 100644
--- a/src/layouts/hass-subpage.ts
+++ b/src/layouts/hass-subpage.ts
@@ -34,11 +34,14 @@ class HassSubpage extends LitElement {
   @restoreScroll(".content") private _savedScrollPos?: number;
 
   protected willUpdate(changedProps: PropertyValues): void {
+    super.willUpdate(changedProps);
+    if (!changedProps.has("hass")) {
+      return;
+    }
     const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
     if (!oldHass || oldHass.locale !== this.hass.locale) {
       toggleAttribute(this, "rtl", computeRTL(this.hass));
     }
-    super.willUpdate(changedProps);
   }
 
   protected render(): TemplateResult {