diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
index d6c2beba9..898fd8140 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
@@ -153,6 +153,16 @@ export const useSetupTemplateStore = defineStore('setupTemplate', () => {
 			wf_template_repo_session_id: templatesStore.currentSessionId,
 		});
 
+		telemetry.track(
+			'User inserted workflow template',
+			{
+				source: 'workflow',
+				template_id: templateId.value,
+				wf_template_repo_session_id: templatesStore.currentSessionId,
+			},
+			{ withPostHog: true },
+		);
+
 		telemetry.track('User closed cred setup', {
 			completed: false,
 			creds_filled: 0,
@@ -196,14 +206,20 @@ export const useSetupTemplateStore = defineStore('setupTemplate', () => {
 				workflow_id: createdWorkflow.id,
 			});
 
-			const telemetryPayload = {
-				source: 'workflow',
-				template_id: template.value.id,
-				wf_template_repo_session_id: templatesStore.currentSessionId,
-			};
+			telemetry.track(
+				'User inserted workflow template',
+				{
+					source: 'workflow',
+					template_id: templateId.value,
+					wf_template_repo_session_id: templatesStore.currentSessionId,
+				},
+				{ withPostHog: true },
+			);
 
-			telemetry.track('User inserted workflow template', telemetryPayload, {
-				withPostHog: true,
+			telemetry.track('User saved new workflow from template', {
+				template_id: templateId.value,
+				workflow_id: createdWorkflow.id,
+				wf_template_repo_session_id: templatesStore.currentSessionId,
 			});
 
 			// Replace the URL so back button doesn't come back to this setup view