diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
index 52ffc79433..e7d957b33d 100644
--- a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
+++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
@@ -31,7 +31,19 @@ export const cloudOnboardingRoutes: RouteRecordRaw[] = [
         path: 'signup',
         name: 'cloud-signup',
         component: () =>
-          import('@/platform/cloud/onboarding/CloudSignupView.vue')
+          import('@/platform/cloud/onboarding/CloudSignupView.vue'),
+        beforeEnter: async (to, _from, next) => {
+          if (!to.query.switchAccount) {
+            const { useCurrentUser } =
+              await import('@/composables/auth/useCurrentUser')
+            const { isLoggedIn } = useCurrentUser()
+
+            if (isLoggedIn.value) {
+              return next({ name: 'cloud-user-check' })
+            }
+          }
+          next()
+        }
       },
       {
         path: 'forgot-password',