diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index 9a178f22d4..29c78c9650 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -76,7 +76,9 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
     this._elements = this._config.elements.map(
       (elementConfig: LovelaceElementConfig) => {
         const element = createStyledHuiElement(elementConfig);
-        element.hass = this.hass;
+        if (this.hass) {
+          element.hass = this.hass;
+        }
         return element as LovelaceElement;
       }
     );
diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index 547aad6357..92e8e3f1e4 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -58,8 +58,12 @@ export abstract class HuiStackCard extends LitElement implements LovelaceCard {
     }
 
     for (const element of this._cards) {
-      element.hass = this.hass;
-      element.editMode = this.editMode;
+      if (this.hass) {
+        element.hass = this.hass;
+      }
+      if (this.editMode !== undefined) {
+        element.editMode = this.editMode;
+      }
     }
   }