diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue
index c60d16c3b9c..02c38aeeb46 100644
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue
@@ -36,7 +36,7 @@ const i18n = useI18n();
 
 const workflowsStore = useWorkflowsStore();
 const workflowDocumentStore = computed(() =>
-	useWorkflowDocumentStore(createWorkflowDocumentId(workflowsStore.workflow.id)),
+	useWorkflowDocumentStore(createWorkflowDocumentId(workflowsStore.workflowId)),
 );
 const credentialsStore = useCredentialsStore();
 const { showMessage } = useToast();
@@ -159,7 +159,7 @@ const shouldShowFreeAiCreditsWarning = computed((): boolean => {
 async function displayActivationError() {
 	let errorMessage: string | VNode;
 	try {
-		const errorData = await workflowsStore.getActivationError(workflowsStore.workflow.id);
+		const errorData = await workflowsStore.getActivationError(workflowsStore.workflowId);
 
 		if (errorData === undefined) {
 			errorMessage = i18n.baseText(
@@ -193,7 +193,7 @@ async function handlePublish() {
 
 	// Activate the workflow
 	const { success, errorHandled } = await workflowActivate.publishWorkflow(
-		workflowsStore.workflow.id,
+		workflowsStore.workflowId,
 		workflowDocumentStore.value?.versionId ?? '',
 		{
 			name: versionName.value,
@@ -219,7 +219,7 @@ async function handlePublish() {
 		}
 
 		telemetry.track('User published version from canvas', {
-			workflow_id: workflowsStore.workflow.id,
+			workflow_id: workflowsStore.workflowId,
 		});
 
 		// For now, just close the modal after successful activation
@@ -264,7 +264,7 @@ async function handlePublish() {
 						<li v-for="node in workflowsStore.nodesWithIssues" :key="node.id">
 							<N8nLink
 								size="small"
-								:to="`/workflow/${workflowsStore.workflow.id}/${node.id}`"
+								:to="`/workflow/${workflowsStore.workflowId}/${node.id}`"
 								@click="modalBus.emit('close')"
 								>{{ node.name }}</N8nLink
 							>
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
index fd9b65c6a4a..fb7e0d540cf 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
@@ -140,7 +140,7 @@ export function useWorkflowSaving({
 		next(
 			router.resolve({
 				name: VIEWS.WORKFLOW,
-				params: { name: workflowsStore.workflow.id },
+				params: { name: workflowsStore.workflowId },
 			}),
 		);
 	}
diff --git a/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue
index ca0cec47271..fc919cf5f37 100644
--- a/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue
+++ b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue
@@ -23,7 +23,7 @@ const usageStore = useUsageStore();
 const pageRedirectionHelper = usePageRedirectionHelper();
 
 const hasRuns = computed(() => {
-	return evaluationStore.testRunsByWorkflowId[workflowsStore.workflow.id]?.length > 0;
+	return evaluationStore.testRunsByWorkflowId[workflowsStore.workflowId]?.length > 0;
 });
 
 const evaluationsAvailable = computed(() => {
@@ -74,7 +74,7 @@ const toggleStep = (index: number) => {
 function navigateToWorkflow(
 	action?: 'addEvaluationTrigger' | 'addEvaluationNode' | 'executeEvaluation',
 ) {
-	const routeWorkflowId = workflowsStore.workflow.id || 'new';
+	const routeWorkflowId = workflowsStore.workflowId || 'new';
 
 	void router.push({
 		name: VIEWS.WORKFLOW,
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterLegacy.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterLegacy.vue
index b751744c15e..9be23134209 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterLegacy.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterLegacy.vue
@@ -407,14 +407,14 @@ const onDragChange = (optionName: string) => {
 const trackWorkflowInputFieldTypeChange = (parameterData: IUpdateInformation) => {
 	telemetry.track('User changed workflow input field type', {
 		type: parameterData.value,
-		workflow_id: workflowsStore.workflow.id,
+		workflow_id: workflowsStore.workflowId,
 		node_id: ndvStore.activeNode?.id,
 	});
 };
 
 const trackWorkflowInputFieldAdded = () => {
 	telemetry.track('User added workflow input field', {
-		workflow_id: workflowsStore.workflow.id,
+		workflow_id: workflowsStore.workflowId,
 		node_id: ndvStore.activeNode?.id,
 	});
 };
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterNew.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterNew.vue
index 804c7a17aeb..6e7f606fc0b 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterNew.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollection/FixedCollectionParameterNew.vue
@@ -414,7 +414,7 @@ const handleDelete = (optionName: string, index?: number) => {
 
 const trackFieldAdded = () => {
 	telemetry.track('User added workflow input field', {
-		workflow_id: workflowsStore.workflow.id,
+		workflow_id: workflowsStore.workflowId,
 		node_id: ndvStore.activeNode?.id,
 	});
 };
@@ -422,7 +422,7 @@ const trackFieldAdded = () => {
 const trackFieldTypeChange = (parameterData: IUpdateInformation) => {
 	telemetry.track('User changed workflow input field type', {
 		type: parameterData.value,
-		workflow_id: workflowsStore.workflow.id,
+		workflow_id: workflowsStore.workflowId,
 		node_id: ndvStore.activeNode?.id,
 	});
 };
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue
index 70c45340a87..a5438066573 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue
@@ -295,7 +295,7 @@ const currentRequestParams = computed(() => {
 		credentials: props.node?.credentials ?? {},
 		filter: searchFilter.value,
 		projectId: projectsStore.currentProjectId,
-		workflowId: workflowsStore.workflow.id,
+		workflowId: workflowsStore.workflowId,
 	};
 });
 
@@ -835,7 +835,7 @@ async function loadResources() {
 			currentNodeParameters: resolvedNodeParameters,
 			credentials: props.node.credentials,
 			projectId: projectsStore.currentProjectId,
-			workflowId: workflowsStore.workflow.id,
+			workflowId: workflowsStore.workflowId,
 		};
 
 		if (params.filter) {
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceMapper/ResourceMapper.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceMapper/ResourceMapper.vue
index dd86398238e..ef4ed4a21ef 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceMapper/ResourceMapper.vue
@@ -340,7 +340,7 @@ const createRequestParams = async (methodName: string) => {
 		methodName,
 		credentials: props.node.credentials,
 		projectId: projectsStore.currentProjectId,
-		workflowId: workflowsStore.workflow.id,
+		workflowId: workflowsStore.workflowId,
 	};
 
 	return requestParams;
diff --git a/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeGroupSetupCard.vue b/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeGroupSetupCard.vue
index 539e5d55c25..f1180c8ca09 100644
--- a/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeGroupSetupCard.vue
+++ b/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeGroupSetupCard.vue
@@ -99,7 +99,7 @@ const hasParameters = computed(() => allSections.value.some(sectionHasParameters
 const telemetryPayload = computed(() => ({
 	type: ['node-group'],
 	template_id: workflowDocumentStore?.value?.meta?.templateId,
-	workflow_id: workflowsStore.workflow.id,
+	workflow_id: workflowsStore.workflowId,
 	node_types: allSections.value.map((s) => s.node.type),
 	has_parameters: hasParameters.value,
 }));
diff --git a/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeSetupCard.vue b/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeSetupCard.vue
index 06e3d6bd0fe..72f3fb5222d 100644
--- a/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeSetupCard.vue
+++ b/packages/frontend/editor-ui/src/features/setupPanel/components/cards/NodeSetupCard.vue
@@ -97,7 +97,7 @@ const telemetryPayload = computed(() => {
 	return {
 		type: types,
 		template_id: workflowDocumentStore?.value?.meta?.templateId,
-		workflow_id: workflowsStore.workflow.id,
+		workflow_id: workflowsStore.workflowId,
 		node_types: (props.state.allNodesUsingCredential ?? [props.state.node]).map((n) => n.type),
 		credential_type: props.state.credentialType,
 		has_parameters: hasParameters.value,