diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts
index c374c5a686..485698fdff 100644
--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -164,6 +164,7 @@ class HaDevicePicker extends SubscribeMixin(LitElement) {
                   slot="suffix"
                   class="clear-button"
                   icon="hass:close"
+                  @click=${this._clearValue}
                   no-ripple
                 >
                   Clear
@@ -189,6 +190,10 @@ class HaDevicePicker extends SubscribeMixin(LitElement) {
     `;
   }
 
+  private _clearValue() {
+    this.value = "";
+  }
+
   private get _value() {
     return this.value || "";
   }
diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index 922611d382..1ade8bff2f 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -166,6 +166,7 @@ class HaEntityPicker extends LitElement {
                   slot="suffix"
                   class="clear-button"
                   icon="hass:close"
+                  @click=${this._clearValue}
                   no-ripple
                 >
                   Clear
@@ -191,6 +192,10 @@ class HaEntityPicker extends LitElement {
     `;
   }
 
+  private _clearValue() {
+    this.value = "";
+  }
+
   private get _value() {
     return this.value || "";
   }