diff --git a/src/components/ha-filter-floor-areas.ts b/src/components/ha-filter-floor-areas.ts
index 911f7f844e..0a5fb1cdee 100644
--- a/src/components/ha-filter-floor-areas.ts
+++ b/src/components/ha-filter-floor-areas.ts
@@ -185,7 +185,10 @@ export class HaFilterFloorAreas extends SubscribeMixin(LitElement) {
   private async _findRelated() {
     const relatedPromises: Promise<RelatedResult>[] = [];
 
-    if (!this.value) {
+    if (
+      !this.value ||
+      (!this.value.areas?.length && !this.value.floors?.length)
+    ) {
       fireEvent(this, "data-table-filter-changed", {
         value: {},
         items: undefined,