diff --git a/src/data/panel.ts b/src/data/panel.ts
index 24e6e31627..eb205c65b0 100644
--- a/src/data/panel.ts
+++ b/src/data/panel.ts
@@ -17,7 +17,9 @@ export const setDefaultPanel = (
 };
 
 export const getDefaultPanel = (hass: HomeAssistant): PanelInfo =>
-  hass.panels[hass.defaultPanel];
+  hass.panels[hass.defaultPanel]
+    ? hass.panels[hass.defaultPanel]
+    : hass.panels[DEFAULT_PANEL];
 
 export const getPanelTitle = (hass: HomeAssistant): string | undefined => {
   if (!hass.panels) {