diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index e51371dc51..48ebff59e5 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -22,8 +22,11 @@ import { DEFAULT_PANEL } from "../common/const";
 const computeUrl = (urlPath) => `/${urlPath}`;
 
 const computePanels = (hass: HomeAssistant) => {
-  const isAdmin = hass.user.is_admin;
   const panels = hass.panels;
+  if (!panels) {
+    return [];
+  }
+  const isAdmin = hass.user.is_admin;
   const sortValue = {
     map: 1,
     logbook: 2,
diff --git a/src/layouts/partial-panel-resolver.ts b/src/layouts/partial-panel-resolver.ts
index acb67d1982..efacfd474b 100644
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -80,7 +80,10 @@ class PartialPanelResolver extends HassRouterPage {
 
     const oldHass = changedProps.get("hass") as this["hass"];
 
-    if (!oldHass || oldHass.panels !== this.hass!.panels) {
+    if (
+      this.hass!.panels &&
+      (!oldHass || oldHass.panels !== this.hass!.panels)
+    ) {
       this._updateRoutes();
     }
   }