diff --git a/src/components/entity/ha-statistic-picker.ts b/src/components/entity/ha-statistic-picker.ts
index fc40f169ea..f5c1d7ff22 100644
--- a/src/components/entity/ha-statistic-picker.ts
+++ b/src/components/entity/ha-statistic-picker.ts
@@ -263,7 +263,9 @@ export class HaStatisticPicker extends LitElement {
         .renderer=${this._rowRenderer}
         .disabled=${this.disabled}
         .allowCustomValue=${this.allowCustomEntity}
-        .filteredItems=${this._statistics}
+        .filteredItems=${this.value && this._statistics.length === 0
+          ? undefined
+          : this._statistics}
         item-value-path="id"
         item-id-path="id"
         item-label-path="name"