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 {