diff --git a/src/components/device/ha-device-trigger-picker.ts b/src/components/device/ha-device-trigger-picker.ts
index 7ff3b6d48d..6330ae76d5 100644
--- a/src/components/device/ha-device-trigger-picker.ts
+++ b/src/components/device/ha-device-trigger-picker.ts
@@ -37,7 +37,10 @@ class HaDeviceTriggerPicker extends LitElement {
   @property() private _renderEmpty = false;
 
   private get _key() {
-    if (!this.value) {
+    if (
+      !this.value ||
+      deviceAutomationTriggersEqual(this._noTrigger, this.value)
+    ) {
       return NO_TRIGGER_KEY;
     }
 
diff --git a/src/panels/config/js/trigger/device.js b/src/panels/config/js/trigger/device.js
index 504eabdb7a..f5d857ab57 100644
--- a/src/panels/config/js/trigger/device.js
+++ b/src/panels/config/js/trigger/device.js
@@ -49,4 +49,6 @@ export default class DeviceTrigger extends Component {
 
 DeviceTrigger.defaultConfig = {
   device_id: "",
+  domain: "",
+  entity_id: "",
 };