diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index ff904948b6..c5ae2fc24b 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -321,11 +321,15 @@
           class:is-selected={Object.hasOwn(editableFields, field)}
           on:click={() => {
             if (Object.hasOwn(editableFields, field)) {
-              editableFields[field] = null
+              delete editableFields[field]
+              onChange({
+                meta: { fields: editableFields },
+                row: { [field]: null },
+              })
             } else {
               editableFields[field] = {}
+              onChange({ meta: { fields: editableFields } })
             }
-            onChange({ meta: { fields: editableFields } })
           }}
         >
           <Icon