diff --git a/packages/frontend-2/components/project/page/Header.vue b/packages/frontend-2/components/project/page/Header.vue
index bad2db382..1f8a20291 100644
--- a/packages/frontend-2/components/project/page/Header.vue
+++ b/packages/frontend-2/components/project/page/Header.vue
@@ -2,14 +2,10 @@
   <div>
     <Portal to="navigation">
       <template v-if="project.workspace && isWorkspacesEnabled">
-        <HeaderNavLink
-          :to="workspacesRoute"
-          name="Workspaces"
-          :separator="false"
-        ></HeaderNavLink>
         <HeaderNavLink
           :to="workspaceRoute(project.workspace.id)"
           :name="project.workspace.name"
+          :separator="false"
         ></HeaderNavLink>
       </template>
       <HeaderNavLink
@@ -49,7 +45,7 @@
 import { graphql } from '~~/lib/common/generated/gql'
 import type { ProjectPageProjectHeaderFragment } from '~~/lib/common/generated/gql/graphql'
 import { projectRoute, projectsRoute } from '~~/lib/common/helpers/route'
-import { workspaceRoute, workspacesRoute } from '~/lib/common/helpers/route'
+import { workspaceRoute } from '~/lib/common/helpers/route'
 
 graphql(`
   fragment ProjectPageProjectHeader on Project {
diff --git a/packages/frontend-2/components/viewer/PreSetupWrapper.vue b/packages/frontend-2/components/viewer/PreSetupWrapper.vue
index 3656df6a4..44a7bbcfa 100644
--- a/packages/frontend-2/components/viewer/PreSetupWrapper.vue
+++ b/packages/frontend-2/components/viewer/PreSetupWrapper.vue
@@ -6,14 +6,10 @@
         <Portal to="navigation">
           <ViewerScope :state="state">
             <template v-if="project?.workspace && isWorkspacesEnabled">
-              <HeaderNavLink
-                :to="workspacesRoute"
-                name="Workspaces"
-                :separator="false"
-              ></HeaderNavLink>
               <HeaderNavLink
                 :to="workspaceRoute(project?.workspace.id)"
                 :name="project?.workspace.name"
+                :separator="false"
               ></HeaderNavLink>
             </template>
             <HeaderNavLink
@@ -126,7 +122,7 @@ import { useEmbed } from '~/lib/viewer/composables/setup/embed'
 import { useViewerTour } from '~/lib/viewer/composables/tour'
 import { useFilterUtilities } from '~/lib/viewer/composables/ui'
 import { projectsRoute } from '~~/lib/common/helpers/route'
-import { workspaceRoute, workspacesRoute } from '~/lib/common/helpers/route'
+import { workspaceRoute } from '~/lib/common/helpers/route'
 
 const emit = defineEmits<{
   setup: [InjectableViewerState]
diff --git a/packages/frontend-2/components/workspace/ProjectList.vue b/packages/frontend-2/components/workspace/ProjectList.vue
index bd06b4c9d..7e588cf3f 100644
--- a/packages/frontend-2/components/workspace/ProjectList.vue
+++ b/packages/frontend-2/components/workspace/ProjectList.vue
@@ -5,8 +5,11 @@
     </div>
     <template v-else>
       <Portal to="navigation">
-        <HeaderNavLink :to="workspacesRoute" name="Workspaces" :separator="false" />
-        <HeaderNavLink :to="workspaceRoute(workspaceId)" :name="workspace?.name" />
+        <HeaderNavLink
+          :to="workspaceRoute(workspaceId)"
+          :name="workspace?.name"
+          :separator="false"
+        />
       </Portal>
       <WorkspaceHeader
         v-if="workspace"
@@ -68,7 +71,7 @@ import type {
   WorkspaceProjectsQueryQueryVariables
 } from '~~/lib/common/generated/gql/graphql'
 import { skipLoggingErrorsIfOneFieldError } from '~/lib/common/helpers/graphql'
-import { workspaceRoute, workspacesRoute } from '~/lib/common/helpers/route'
+import { workspaceRoute } from '~/lib/common/helpers/route'
 import { Roles } from '@speckle/shared'
 
 graphql(`