diff --git a/packages/editor-ui/src/mixins/workflowRun.ts b/packages/editor-ui/src/mixins/workflowRun.ts
index 170f2ed0c5f98..23e235e5fe089 100644
--- a/packages/editor-ui/src/mixins/workflowRun.ts
+++ b/packages/editor-ui/src/mixins/workflowRun.ts
@@ -185,9 +185,7 @@ export const workflowRun = defineComponent({
 					startNodes.push(nodeName);
 				}
 
-				const isNewWorkflow = this.workflowsStore.isNewWorkflow;
-				const hasWebhookNode = this.workflowsStore.currentWorkflowHasWebhookNode;
-				if (isNewWorkflow && hasWebhookNode) {
+				if (this.workflowsStore.isNewWorkflow) {
 					await this.saveCurrentWorkflow();
 				}
 
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 811535ace04a8..ae35bf88c5840 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -164,7 +164,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			});
 		},
 		currentWorkflowHasWebhookNode(): boolean {
-			return !!this.workflow.nodes.find((node: INodeUi) => !!node.webhookId);
+			return !!this.workflow.nodes.find((node: INodeUi) => !!node.webhookId); // includes Wait node
 		},
 		getWorkflowRunData(): IRunData | null {
 			if (!this.workflowExecutionData?.data?.resultData) {