diff --git a/src/common/datetime/create_duration_data.ts b/src/common/datetime/create_duration_data.ts
index b198b5dbcb..3b743471ca 100644
--- a/src/common/datetime/create_duration_data.ts
+++ b/src/common/datetime/create_duration_data.ts
@@ -3,9 +3,9 @@ import type { ForDict } from "../../data/automation";
 
 export const createDurationData = (
   duration: string | number | ForDict | undefined
-): HaDurationData => {
+): HaDurationData | undefined => {
   if (duration === undefined) {
-    return {};
+    return undefined;
   }
   if (typeof duration !== "object") {
     if (typeof duration === "string" || isNaN(duration)) {
diff --git a/src/panels/config/automation/action/types/ha-automation-action-delay.ts b/src/panels/config/automation/action/types/ha-automation-action-delay.ts
index 488494e65e..2d71065f8b 100644
--- a/src/panels/config/automation/action/types/ha-automation-action-delay.ts
+++ b/src/panels/config/automation/action/types/ha-automation-action-delay.ts
@@ -15,7 +15,7 @@ export class HaDelayAction extends LitElement implements ActionElement {
 
   @property() public action!: DelayAction;
 
-  @property() public _timeData!: HaDurationData;
+  @property() public _timeData?: HaDurationData;
 
   public static get defaultConfig() {
     return { delay: "" };
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 e6d166adaa..61e064ff4c 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
@@ -53,7 +53,7 @@ export class HaStateCondition extends LitElement implements ConditionElement {
 
   protected render() {
     const trgFor = createDurationData(this.condition.for);
-    const data = { ...this.condition, ...{ for: trgFor } };
+    const data = { ...this.condition, for: trgFor };
     const schema = this._schema(this.condition.entity_id);
 
     return html`