diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 02f15ea518..1c16ba5393 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -165,7 +165,7 @@ export interface IExecutionBase {
 // Data in regular format with references
 export interface IExecutionDb extends IExecutionBase {
 	data: IRunExecutionData;
-	waitTill?: Date;
+	waitTill?: Date | null;
 	workflowData?: IWorkflowBase;
 }
 
@@ -179,7 +179,7 @@ export interface IExecutionResponse extends IExecutionBase {
 	data: IRunExecutionData;
 	retryOf?: string;
 	retrySuccessId?: string;
-	waitTill?: Date;
+	waitTill?: Date | null;
 	workflowData: IWorkflowBase;
 }
 
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 4441cb8e31..1a58e135dd 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -124,7 +124,7 @@ export class WaitTracker {
 		};
 
 		fullExecutionData.stoppedAt = new Date();
-		fullExecutionData.waitTill = undefined;
+		fullExecutionData.waitTill = null;
 		fullExecutionData.status = 'canceled';
 
 		await Db.collections.Execution.update(
diff --git a/packages/cli/src/databases/entities/ExecutionEntity.ts b/packages/cli/src/databases/entities/ExecutionEntity.ts
index a29ef9da0e..c16365bbcf 100644
--- a/packages/cli/src/databases/entities/ExecutionEntity.ts
+++ b/packages/cli/src/databases/entities/ExecutionEntity.ts
@@ -49,7 +49,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	workflowId: string;
 
 	@Column({ type: datetimeColumnType, nullable: true })
-	waitTill: Date;
+	waitTill: Date | null;
 
 	@OneToMany('ExecutionMetadata', 'execution')
 	metadata: ExecutionMetadata[];
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 0a598b1b2d..e34457d8af 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1547,7 +1547,7 @@ export interface IRun {
 	data: IRunExecutionData;
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
-	waitTill?: Date;
+	waitTill?: Date | null;
 	startedAt: Date;
 	stoppedAt?: Date;
 	status: ExecutionStatus;