diff --git a/apps/web/app/(org)/onboarding/Onboarding.tsx b/apps/web/app/(org)/onboarding/Onboarding.tsx
index 26a4d3069..c06840cc8 100644
--- a/apps/web/app/(org)/onboarding/Onboarding.tsx
+++ b/apps/web/app/(org)/onboarding/Onboarding.tsx
@@ -33,10 +33,13 @@ export const Onboarding = () => {
       if (response.ok) {
         const data = await response.json();
 
-        if (!data.isMemberOfOrganization) setShowUpgradeModal(true);
+        if (!data.isMemberOfOrganization) {
+          setShowUpgradeModal(true);
+        } else {
+          router.push("/dashboard");
+        }
 
         toast.success("Name updated successfully");
-        router.push("/dashboard");
       } else {
         toast.error("Failed to update name");
       }