diff --git a/src/panels/lovelace/badges/hui-entity-filter-badge.ts b/src/panels/lovelace/badges/hui-entity-filter-badge.ts
index 428faeda40..444ec7d3f6 100644
--- a/src/panels/lovelace/badges/hui-entity-filter-badge.ts
+++ b/src/panels/lovelace/badges/hui-entity-filter-badge.ts
@@ -109,10 +109,8 @@ class EntityFilterBadge extends HTMLElement implements LovelaceBadge {
       return;
     }
 
-    let child = this.lastElementChild;
-    while (child) {
-      this.removeChild(child);
-      child = this.lastElementChild;
+    while (this.lastChild) {
+      this.removeChild(this.lastChild);
     }
 
     for (const element of this._elements) {