diff --git a/packages/frontend-2/components/onboarding/questions/Form.vue b/packages/frontend-2/components/onboarding/questions/Form.vue
index 56e3cbe9f..42ff3b76f 100644
--- a/packages/frontend-2/components/onboarding/questions/Form.vue
+++ b/packages/frontend-2/components/onboarding/questions/Form.vue
@@ -29,13 +29,11 @@ import { useForm } from 'vee-validate'
 import type { OnboardingRole, OnboardingPlan, OnboardingSource } from '@speckle/shared'
 import { useProcessOnboarding } from '~~/lib/auth/composables/onboarding'
 import { homeRoute, bookDemoRoute } from '~/lib/common/helpers/route'
-import { useDiscoverableWorkspaces } from '~/lib/workspaces/composables/discoverableWorkspaces'
 import { useBreakpoints } from '@vueuse/core'
 import { TailwindBreakpoints } from '~~/lib/common/helpers/tailwind'
 
 const isOnboardingForced = useIsOnboardingForced()
 const isWorkspacesEnabled = useIsWorkspacesEnabled()
-const { hasDiscoverableWorkspaces } = useDiscoverableWorkspaces()
 const breakpoints = useBreakpoints(TailwindBreakpoints)
 const isMobile = breakpoints.smaller('sm')
 
@@ -58,11 +56,8 @@ const onSubmit = handleSubmit(async () => {
     plans: values.plan,
     source: values.source
   })
-  if (isWorkspacesEnabled.value && hasDiscoverableWorkspaces.value && !isMobile.value) {
-    navigateTo(bookDemoRoute)
-  } else {
-    navigateTo(homeRoute)
-  }
+
+  navigateTo(!isMobile.value && isWorkspacesEnabled.value ? bookDemoRoute : homeRoute)
 })
 
 const onSkip = () => {
diff --git a/packages/frontend-2/pages/book-a-demo.vue b/packages/frontend-2/pages/book-a-demo.vue
index 249539fae..8272c5ee6 100644
--- a/packages/frontend-2/pages/book-a-demo.vue
+++ b/packages/frontend-2/pages/book-a-demo.vue
@@ -9,7 +9,7 @@
           class="opacity-70 hover:opacity-100 p-1"
           size="sm"
           color="subtle"
-          @click="navigateTo(workspaceJoinRoute)"
+          @click="navigateTo(homeRoute)"
         >
           Skip
         </FormButton>
@@ -49,7 +49,7 @@
             Continue
           </FormButton>
         </div>
-        <FormButton v-else size="lg" full-width @click="navigateTo(workspaceJoinRoute)">
+        <FormButton v-else size="lg" full-width @click="navigateTo(homeRoute)">
           Continue
         </FormButton>
       </div>
@@ -59,7 +59,7 @@
 
 <script setup lang="ts">
 import { useAuthManager } from '~/lib/auth/composables/auth'
-import { workspaceJoinRoute } from '~/lib/common/helpers/route'
+import { homeRoute } from '~/lib/common/helpers/route'
 import { useMixpanel } from '~~/lib/core/composables/mp'
 
 type BookDemoSelect = 'yes' | 'no'
@@ -96,7 +96,7 @@ const onCtaClick = () => {
     })
   } else {
     mixpanel.track('Book a Demo Skipped')
-    navigateTo(workspaceJoinRoute)
+    navigateTo(homeRoute)
   }
 }