diff --git a/src/panels/lovelace/badges/hui-entity-filter-badge.ts b/src/panels/lovelace/badges/hui-entity-filter-badge.ts
index eb569aafc9..428faeda40 100644
--- a/src/panels/lovelace/badges/hui-entity-filter-badge.ts
+++ b/src/panels/lovelace/badges/hui-entity-filter-badge.ts
@@ -109,11 +109,14 @@ class EntityFilterBadge extends HTMLElement implements LovelaceBadge {
       return;
     }
 
-    // Attach element if it has never been attached.
-    if (!this.lastChild) {
-      for (const element of this._elements) {
-        this.appendChild(element);
-      }
+    let child = this.lastElementChild;
+    while (child) {
+      this.removeChild(child);
+      child = this.lastElementChild;
+    }
+
+    for (const element of this._elements) {
+      this.appendChild(element);
     }
 
     this.style.display = "inline";