diff --git a/src/panels/lovelace/common/load-resources.ts b/src/panels/lovelace/common/load-resources.ts
index 27e1d8a416..d8d0f5a1b3 100644
--- a/src/panels/lovelace/common/load-resources.ts
+++ b/src/panels/lovelace/common/load-resources.ts
@@ -11,7 +11,8 @@ export const loadLovelaceResources = (
   hass: HomeAssistant
 ) => {
   // Don't load ressources on safe mode
-  if (hass.config.safe_mode) {
+  // Sometimes, hass.config is null but it should not.
+  if (hass.config?.safe_mode) {
     return;
   }
   resources.forEach((resource) => {
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index ae6bc209ed..61bd60ae62 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -229,9 +229,9 @@ export class LovelacePanel extends LitElement {
     }
     if (!resourcesLoaded) {
       resourcesLoaded = true;
-      const resources = await (preloadWindow.llResProm ||
-        fetchResources(this.hass!.connection));
-      loadLovelaceResources(resources, this.hass!);
+      (preloadWindow.llResProm || fetchResources(this.hass!.connection)).then(
+        (resources) => loadLovelaceResources(resources, this.hass!)
+      );
     }
 
     if (this.urlPath !== null || !confProm) {