diff --git a/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue b/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
index daabc0a1780bc2..6cb5b6cbad706a 100644
--- a/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
+++ b/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
@@ -1,14 +1,20 @@
 <script setup lang="ts">
+import { computed, ref, onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+
+import { TIME } from '@/constants';
+import { useBeforeUnload } from '@/composables/useBeforeUnload';
 import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCollaborationStore } from '@/stores/collaboration.store';
-import { onBeforeUnmount, onMounted, computed, ref } from 'vue';
-import { TIME } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
 import { isUserGlobalOwner } from '@/utils/userUtils';
 
+const route = useRoute();
 const collaborationStore = useCollaborationStore();
 const usersStore = useUsersStore();
 const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
 
 const HEARTBEAT_INTERVAL = 5 * TIME.MINUTE;
 const heartbeatTimer = ref<number | null>(null);
@@ -53,16 +59,41 @@ const onDocumentVisibilityChange = () => {
 	}
 };
 
-onMounted(() => {
+const { addBeforeUnloadHandler } = useBeforeUnload({ route });
+const unloadTimeout = ref<NodeJS.Timeout | null>(null);
+const beforeUnloadHandler = () => {
+	const { workflowId } = workflowsStore;
+	// Notify that workflow is closed straight away
+	collaborationStore.notifyWorkflowClosed(workflowId);
+	if (uiStore.stateIsDirty) {
+		// If user decided to stay on the page we notify that the workflow is opened again
+		unloadTimeout.value = setTimeout(() => {
+			collaborationStore.notifyWorkflowOpened(workflowId);
+		}, 5 * TIME.SECOND);
+	}
+};
+
+onBeforeMount(() => {
 	collaborationStore.initialize();
+
 	startHeartbeat();
 	document.addEventListener('visibilitychange', onDocumentVisibilityChange);
+	addBeforeUnloadHandler(beforeUnloadHandler);
+});
+
+onMounted(() => {
+	collaborationStore.notifyWorkflowOpened(workflowsStore.workflowId);
 });
 
 onBeforeUnmount(() => {
+	collaborationStore.notifyWorkflowClosed(workflowsStore.workflowId);
+	collaborationStore.terminate();
+
 	document.removeEventListener('visibilitychange', onDocumentVisibilityChange);
 	stopHeartbeat();
-	collaborationStore.terminate();
+	if (unloadTimeout.value) {
+		clearTimeout(unloadTimeout.value);
+	}
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 05e2dda79d2e93..3684f6165919fa 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -676,7 +676,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 			</span>
 			<EnterpriseEdition :features="[EnterpriseEditionFeature.Sharing]">
 				<div :class="$style.group">
-					<CollaborationPane v-if="nodeViewVersion === '2'" />
+					<CollaborationPane v-if="nodeViewVersion === '2' && !isNewWorkflow" />
 					<N8nButton
 						type="secondary"
 						data-test-id="workflow-share-button"
diff --git a/packages/editor-ui/src/stores/collaboration.store.ts b/packages/editor-ui/src/stores/collaboration.store.ts
index e9f4afe168496c..7a51569cabfe51 100644
--- a/packages/editor-ui/src/stores/collaboration.store.ts
+++ b/packages/editor-ui/src/stores/collaboration.store.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
-import { STORES } from '@/constants';
+import { STORES, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import type { IUser } from '@/Interface';
 import { useUsersStore } from '@/stores/users.store';
 
@@ -44,6 +44,7 @@ export const useCollaborationStore = defineStore(STORES.COLLABORATION, () => {
 			pushStoreEventListenerRemovalFn.value();
 			pushStoreEventListenerRemovalFn.value = null;
 		}
+		pushStore.clearQueue();
 	}
 
 	function workflowUsersUpdated(data: ActiveUsersForWorkflows) {
@@ -62,6 +63,7 @@ export const useCollaborationStore = defineStore(STORES.COLLABORATION, () => {
 	}
 
 	function notifyWorkflowOpened(workflowId: string) {
+		if (workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) return;
 		pushStore.send({
 			type: 'workflowOpened',
 			workflowId,
@@ -69,6 +71,7 @@ export const useCollaborationStore = defineStore(STORES.COLLABORATION, () => {
 	}
 
 	function notifyWorkflowClosed(workflowId: string) {
+		if (workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) return;
 		pushStore.send({ type: 'workflowClosed', workflowId });
 
 		functionRemoveCurrentUserFromActiveUsers(workflowId);
diff --git a/packages/editor-ui/src/stores/pushConnection.store.ts b/packages/editor-ui/src/stores/pushConnection.store.ts
index eb6dcbc85d8eef..47594de22883c0 100644
--- a/packages/editor-ui/src/stores/pushConnection.store.ts
+++ b/packages/editor-ui/src/stores/pushConnection.store.ts
@@ -150,6 +150,10 @@ export const usePushConnectionStore = defineStore(STORES.PUSH, () => {
 		onMessageReceivedHandlers.value.forEach((handler) => handler(receivedData));
 	}
 
+	const clearQueue = () => {
+		outgoingQueue.value = [];
+	};
+
 	return {
 		pushRef,
 		pushSource,
@@ -159,5 +163,6 @@ export const usePushConnectionStore = defineStore(STORES.PUSH, () => {
 		pushConnect,
 		pushDisconnect,
 		send,
+		clearQueue,
 	};
 });
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index d0520ab676f7fc..aa3ed46098cecb 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -58,7 +58,6 @@ import {
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	START_NODE_TYPE,
 	STICKY_NODE_TYPE,
-	TIME,
 	VALID_WORKFLOW_IMPORT_URL_REGEX,
 	VIEWS,
 	WORKFLOW_LM_CHAT_MODAL_KEY,
@@ -104,7 +103,6 @@ import { createEventBus } from 'n8n-design-system';
 import type { PinDataSource } from '@/composables/usePinnedData';
 import { useClipboard } from '@/composables/useClipboard';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
-import { useCollaborationStore } from '@/stores/collaboration.store';
 import { getResourcePermissions } from '@/permissions';
 import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
 
@@ -138,7 +136,6 @@ const credentialsStore = useCredentialsStore();
 const environmentsStore = useEnvironmentsStore();
 const externalSecretsStore = useExternalSecretsStore();
 const rootStore = useRootStore();
-const collaborationStore = useCollaborationStore();
 const executionsStore = useExecutionsStore();
 const canvasStore = useCanvasStore();
 const npsSurveyStore = useNpsSurveyStore();
@@ -152,10 +149,9 @@ const templatesStore = useTemplatesStore();
 
 const canvasEventBus = createEventBus<CanvasEventBusEvents>();
 
-const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings, addBeforeUnloadHandler } =
-	useBeforeUnload({
-		route,
-	});
+const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBeforeUnload({
+	route,
+});
 const { registerCustomAction, unregisterCustomAction } = useGlobalLinkActions();
 const { runWorkflow, stopCurrentExecution, stopWaitingForWebhook } = useRunWorkflow({ router });
 const {
@@ -355,8 +351,6 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
 		await projectsStore.setProjectNavActiveIdByWorkflowHomeProject(
 			editableWorkflow.value.homeProject,
 		);
-
-		collaborationStore.notifyWorkflowOpened(id);
 	} catch (error) {
 		toast.showError(error, i18n.baseText('openWorkflow.workflowNotFoundError'));
 
@@ -1484,12 +1478,9 @@ watch(
 onBeforeMount(() => {
 	if (!isDemoRoute.value) {
 		pushConnectionStore.pushConnect();
-		collaborationStore.initialize();
 	}
 });
 
-const unloadTimeout = ref<NodeJS.Timeout | null>(null);
-
 onMounted(() => {
 	canvasStore.startLoading();
 
@@ -1522,18 +1513,6 @@ onMounted(() => {
 	addImportEventBindings();
 	addExecutionOpenedEventBindings();
 	registerCustomActions();
-
-	addBeforeUnloadHandler(() => {
-		const { workflowId } = workflowsStore;
-		// Notify that workflow is closed straight away
-		collaborationStore.notifyWorkflowClosed(workflowId);
-		if (uiStore.stateIsDirty) {
-			// If user decided to stay on the page we notify that the workflow is opened again
-			unloadTimeout.value = setTimeout(() => {
-				collaborationStore.notifyWorkflowOpened(workflowId);
-			}, 5 * TIME.SECOND);
-		}
-	});
 });
 
 onActivated(async () => {
@@ -1552,9 +1531,9 @@ onBeforeUnmount(() => {
 	removeImportEventBindings();
 	removeExecutionOpenedEventBindings();
 	unregisterCustomActions();
-	collaborationStore.terminate();
-	if (unloadTimeout.value) {
-		clearTimeout(unloadTimeout.value);
+
+	if (!isDemoRoute.value) {
+		pushConnectionStore.pushDisconnect();
 	}
 });
 </script>
diff --git a/packages/editor-ui/src/views/NodeViewSwitcher.vue b/packages/editor-ui/src/views/NodeViewSwitcher.vue
index 190b02680af55e..f66b1ba619cbea 100644
--- a/packages/editor-ui/src/views/NodeViewSwitcher.vue
+++ b/packages/editor-ui/src/views/NodeViewSwitcher.vue
@@ -56,9 +56,6 @@ onBeforeRouteLeave(async (to, from, next) => {
 
 	await workflowHelpers.promptSaveUnsavedWorkflowChanges(next, {
 		async confirm() {
-			// Make sure workflow id is empty when leaving the editor
-			workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-
 			if (from.name === VIEWS.NEW_WORKFLOW) {
 				// Replace the current route with the new workflow route
 				// before navigating to the new route when saving new workflow.
@@ -72,11 +69,10 @@ onBeforeRouteLeave(async (to, from, next) => {
 				return false;
 			}
 
-			return true;
-		},
-		async cancel() {
+			// Make sure workflow id is empty when leaving the editor
 			workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-			resetWorkspace();
+
+			return true;
 		},
 	});
 });