diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.ts b/src/panels/lovelace/cards/hui-entity-filter-card.ts
index a18026e24f..9b55fd7d14 100644
--- a/src/panels/lovelace/cards/hui-entity-filter-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-filter-card.ts
@@ -151,6 +151,7 @@ export class HuiEntityFilterCard
 
     if (entitiesList.length === 0 && this._config.show_empty === false) {
       this.style.display = "none";
+      this.toggleAttribute("hidden", true);
       return;
     }
 
@@ -181,6 +182,7 @@ export class HuiEntityFilterCard
     }
 
     this.style.display = "block";
+    this.toggleAttribute("hidden", false);
   }
 
   private _haveEntitiesChanged(oldHass: HomeAssistant | null): boolean {
diff --git a/src/panels/lovelace/components/hui-conditional-base.ts b/src/panels/lovelace/components/hui-conditional-base.ts
index df8f268a26..31e14edbca 100644
--- a/src/panels/lovelace/components/hui-conditional-base.ts
+++ b/src/panels/lovelace/components/hui-conditional-base.ts
@@ -33,8 +33,6 @@ export class HuiConditionalBase extends ReactiveElement {
 
   @property({ type: Boolean }) public editMode = false;
 
-  @property({ type: Boolean, reflect: true }) public hidden = false;
-
   @state() protected _config?: ConditionalCardConfig | ConditionalRowConfig;
 
   protected _element?: LovelaceCard | LovelaceRow;
@@ -151,7 +149,7 @@ export class HuiConditionalBase extends ReactiveElement {
       return;
     }
     const visible = this.editMode || conditionMet;
-    this.hidden = !visible;
+    this.toggleAttribute("hidden", !visible);
     this.style.setProperty("display", visible ? "" : "none");
 
     if (visible) {