diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.js b/src/panels/lovelace/cards/hui-entity-filter-card.js
deleted file mode 100644
index 7b854b9e5b..0000000000
--- a/src/panels/lovelace/cards/hui-entity-filter-card.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import { createCardElement } from "../common/create-card-element";
-import { processConfigEntities } from "../common/process-config-entities";
-
-function getEntities(hass, filterState, entities) {
-  return entities.filter((entityConf) => {
-    const stateObj = hass.states[entityConf.entity];
-    return stateObj && filterState.includes(stateObj.state);
-  });
-}
-
-class HuiEntitiesCard extends PolymerElement {
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-        observer: "_hassChanged",
-      },
-    };
-  }
-
-  getCardSize() {
-    return this.lastChild ? this.lastChild.getCardSize() : 1;
-  }
-
-  setConfig(config) {
-    if (!config.state_filter || !Array.isArray(config.state_filter)) {
-      throw new Error("Incorrect filter config.");
-    }
-
-    this._config = config;
-    this._configEntities = processConfigEntities(config.entities);
-
-    if (this.lastChild) {
-      this.removeChild(this.lastChild);
-      this._element = null;
-    }
-
-    const card = "card" in config ? { ...config.card } : {};
-    if (!card.type) card.type = "entities";
-    card.entities = [];
-
-    const element = createCardElement(card);
-    element._filterRawConfig = card;
-    this._updateCardConfig(element);
-
-    this._element = element;
-  }
-
-  _hassChanged() {
-    this._updateCardConfig(this._element);
-  }
-
-  _updateCardConfig(element) {
-    if (!element || element.tagName === "HUI-ERROR-CARD" || !this.hass) return;
-    const entitiesList = getEntities(
-      this.hass,
-      this._config.state_filter,
-      this._configEntities
-    );
-
-    if (entitiesList.length === 0 && this._config.show_empty === false) {
-      this.style.display = "none";
-      return;
-    }
-
-    this.style.display = "block";
-    element.setConfig({ ...element._filterRawConfig, entities: entitiesList });
-    element.isPanel = this.isPanel;
-    element.hass = this.hass;
-
-    // Attach element if it has never been attached.
-    if (!this.lastChild) this.appendChild(element);
-  }
-}
-customElements.define("hui-entity-filter-card", HuiEntitiesCard);
diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.ts b/src/panels/lovelace/cards/hui-entity-filter-card.ts
new file mode 100644
index 0000000000..10126c2df2
--- /dev/null
+++ b/src/panels/lovelace/cards/hui-entity-filter-card.ts
@@ -0,0 +1,94 @@
+import { createCardElement } from "../common/create-card-element";
+import { processConfigEntities } from "../common/process-config-entities";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
+import { EntityConfig } from "../entity-rows/types";
+import { HomeAssistant } from "../../../types";
+
+export interface EntityFilterCardConfig extends LovelaceCardConfig {
+  type: "entity-filter";
+  entities: Array<EntityConfig | string>;
+  state_filter: string[];
+  card: Partial<LovelaceCardConfig>;
+  show_empty?: boolean;
+}
+
+class EntityFilterCard extends HTMLElement implements LovelaceCard {
+  public isPanel?: boolean;
+  private _element?: LovelaceCard;
+  private _config?: EntityFilterCardConfig;
+  private _configEntities?: EntityConfig[];
+  private _baseCardConfig?: LovelaceCardConfig;
+
+  public getCardSize(): number {
+    return this._element ? this._element.getCardSize() : 1;
+  }
+
+  public setConfig(config: EntityFilterCardConfig): void {
+    if (!config.state_filter || !Array.isArray(config.state_filter)) {
+      throw new Error("Incorrect filter config.");
+    }
+
+    this._config = config;
+    this._configEntities = undefined;
+    this._baseCardConfig = {
+      type: "entities",
+      entities: [],
+      ...this._config.card,
+    };
+
+    if (this.lastChild) {
+      this.removeChild(this.lastChild);
+      this._element = undefined;
+    }
+  }
+
+  set hass(hass: HomeAssistant) {
+    if (!hass || !this._config) {
+      return;
+    }
+
+    if (!this._configEntities) {
+      this._configEntities = processConfigEntities(this._config.entities);
+    }
+
+    const entitiesList = this._configEntities.filter((entityConf) => {
+      const stateObj = hass.states[entityConf.entity];
+      return stateObj && this._config!.state_filter.includes(stateObj.state);
+    });
+
+    if (entitiesList.length === 0 && this._config.show_empty === false) {
+      this.style.display = "none";
+      return;
+    }
+
+    const element = this._cardElement();
+
+    if (!element) {
+      return;
+    }
+
+    if (element.tagName !== "HUI-ERROR-CARD") {
+      element.setConfig({ ...this._baseCardConfig!, entities: entitiesList });
+      element.isPanel = this.isPanel;
+      element.hass = hass;
+    }
+
+    // Attach element if it has never been attached.
+    if (!this.lastChild) {
+      this.appendChild(element);
+    }
+
+    this.style.display = "block";
+  }
+
+  private _cardElement(): LovelaceCard | undefined {
+    if (!this._element && this._config) {
+      const element = createCardElement(this._baseCardConfig!);
+      this._element = element;
+    }
+
+    return this._element;
+  }
+}
+customElements.define("hui-entity-filter-card", EntityFilterCard);
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index bf394921b2..54bb13bb50 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -19,6 +19,7 @@ export interface Lovelace {
 
 export interface LovelaceCard extends HTMLElement {
   hass?: HomeAssistant;
+  isPanel?: boolean;
   getCardSize(): number;
   setConfig(config: LovelaceCardConfig): void;
 }