diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useNavigateAwayFromWorkspace/useNavigateAwayFromWorkspace.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useNavigateAwayFromWorkspace/useNavigateAwayFromWorkspace.ts
index 6915878a0f6..19bf7f0aff0 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useNavigateAwayFromWorkspace/useNavigateAwayFromWorkspace.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useNavigateAwayFromWorkspace/useNavigateAwayFromWorkspace.ts
@@ -1,4 +1,4 @@
-import { useNavigate, useParams } from "@tanstack/react-router";
+import { useMatchRoute, useNavigate } from "@tanstack/react-router";
 import { navigateToV2Workspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import { getFlattenedV2WorkspaceIds } from "../../utils/getFlattenedV2WorkspaceIds";
@@ -11,13 +11,19 @@ import { getFlattenedV2WorkspaceIds } from "../../utils/getFlattenedV2WorkspaceI
  */
 export function useNavigateAwayFromWorkspace() {
 	const navigate = useNavigate();
-	const params = useParams({ strict: false });
+	const matchRoute = useMatchRoute();
 	const collections = useCollections();
 
 	return (workspaceId: string) => {
-		if (params.workspaceId !== workspaceId) return;
-		const ids = getFlattenedV2WorkspaceIds(collections);
-		const next = ids.find((id) => id !== workspaceId);
+		const isViewingWorkspace = !!matchRoute({
+			to: "/v2-workspace/$workspaceId",
+			params: { workspaceId },
+			fuzzy: true,
+		});
+		if (!isViewingWorkspace) return;
+		const next = getFlattenedV2WorkspaceIds(collections).find(
+			(id) => id !== workspaceId,
+		);
 		if (next) {
 			void navigateToV2Workspace(next, navigate);
 		} else {