diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index 1c9b1552a3..4d7286797b 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -30,6 +30,9 @@ export const handleChangeEvent = (
   ev: CustomEvent
 ) => {
   ev.stopPropagation();
+  if (ev.detail.isValid === false) {
+    return;
+  }
   const name = (ev.target as any)?.name;
   if (!name) {
     return;
diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
index 2b42b53630..96e2d8ad79 100644
--- a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
@@ -41,14 +41,27 @@ export class HaStateCondition extends LitElement implements ConditionElement {
         @value-changed=${this._valueChanged}
         allow-custom-value
       ></ha-entity-attribute-picker>
-      <paper-input
-        .label=${this.hass.localize(
-          "ui.panel.config.automation.editor.conditions.type.state.state"
-        )}
-        .name=${"state"}
-        .value=${state}
-        @value-changed=${this._valueChanged}
-      ></paper-input>
+      ${Array.isArray(state)
+        ? html`
+            <ha-yaml-editor
+              .label=${this.hass.localize(
+                "ui.panel.config.automation.editor.conditions.type.state.state"
+              ) + " (YAML)"}
+              .defaultValue=${state}
+              .name=${"state"}
+              @value-changed=${this._valueChanged}
+            ></ha-yaml-editor>
+          `
+        : html`
+            <paper-input
+              .label=${this.hass.localize(
+                "ui.panel.config.automation.editor.conditions.type.state.state"
+              )}
+              .name=${"state"}
+              .value=${state}
+              @value-changed=${this._valueChanged}
+            ></paper-input>
+          `}
     `;
   }