diff --git a/src/panels/config/automation/condition/ha-automation-condition.ts b/src/panels/config/automation/condition/ha-automation-condition.ts
index 36cb5fb485..f562d12203 100644
--- a/src/panels/config/automation/condition/ha-automation-condition.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition.ts
@@ -150,7 +150,7 @@ export default class HaAutomationCondition extends LitElement {
         : null}
       <div class="conditions">
         ${repeat(
-          this.conditions,
+          this.conditions.filter((c) => typeof c === "object"),
           (condition) => this._getKey(condition),
           (cond, idx) => html`
             <ha-automation-condition-row
@@ -348,6 +348,8 @@ export default class HaAutomationCondition extends LitElement {
       conditions[index] = newValue;
     }
 
+    this.conditions = conditions;
+
     fireEvent(this, "value-changed", { value: conditions });
   }
 
diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index c06c73ba3e..7df66a42ae 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -558,10 +558,10 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
 
   private _valueChanged(ev: CustomEvent<{ value: AutomationConfig }>) {
     ev.stopPropagation();
+    this._config = ev.detail.value;
     if (this._readOnly) {
       return;
     }
-    this._config = ev.detail.value;
     this._dirty = true;
     this._errors = undefined;
   }