diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 2ef80eaa7f..81080552d6 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -204,7 +204,7 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
                       <hui-entities-toggle
                         .hass=${this._hass}
                         .entities=${(this._configEntities!.filter(
-                          (conf) => "type" in conf
+                          (conf) => !("type" in conf)
                         ) as EntityConfig[]).map((conf) => conf.entity)}
                       ></hui-entities-toggle>
                     `}
diff --git a/src/panels/lovelace/components/hui-entities-toggle.ts b/src/panels/lovelace/components/hui-entities-toggle.ts
index 35fe8910b5..b1d56f8626 100644
--- a/src/panels/lovelace/components/hui-entities-toggle.ts
+++ b/src/panels/lovelace/components/hui-entities-toggle.ts
@@ -3,9 +3,9 @@ import {
   CSSResult,
   customElement,
   html,
+  internalProperty,
   LitElement,
   property,
-  internalProperty,
   PropertyValues,
   TemplateResult,
 } from "lit-element";
@@ -18,9 +18,9 @@ import { turnOnOffEntities } from "../common/entity/turn-on-off-entities";
 
 @customElement("hui-entities-toggle")
 class HuiEntitiesToggle extends LitElement {
-  @property() public entities?: string[];
+  @property({ type: Array }) public entities?: string[];
 
-  @property() protected hass?: HomeAssistant;
+  @property({ attribute: false }) protected hass?: HomeAssistant;
 
   @internalProperty() private _toggleEntities?: string[];
 
@@ -36,7 +36,7 @@ class HuiEntitiesToggle extends LitElement {
   }
 
   protected render(): TemplateResult {
-    if (!this._toggleEntities) {
+    if (!this._toggleEntities?.length) {
       return html``;
     }
 
@@ -45,11 +45,11 @@ class HuiEntitiesToggle extends LitElement {
         aria-label=${this.hass!.localize(
           "ui.panel.lovelace.card.entities.toggle"
         )}
-        .checked="${this._toggleEntities!.some((entityId) => {
+        .checked=${this._toggleEntities!.some((entityId) => {
           const stateObj = this.hass!.states[entityId];
           return stateObj && stateObj.state === "on";
-        })}"
-        @change="${this._callService}"
+        })}
+        @change=${this._callService}
       ></ha-switch>
     `;
   }