diff --git a/src/pages/onboarding/onboarding-group.tsx b/src/pages/onboarding/onboarding-group.tsx
index d06b559f..66397665 100644
--- a/src/pages/onboarding/onboarding-group.tsx
+++ b/src/pages/onboarding/onboarding-group.tsx
@@ -31,10 +31,19 @@ const OnboardingGroup = () => {
     setSelection((prev) => ({ ...prev, [stepName]: value }));
   };
 
+  const handlePrev = () => {
+    if (currentStep === 'GROUP_ROLE' || currentStep === 'COMPLETE') {
+      navigate(ROUTES.HOME);
+      return;
+    }
+
+    goPrev();
+  };
+
   return (
     <div className="h-full flex-col">
       <div className="sticky top-0 bg-background">
-        <OnboardingHeader onClick={goPrev} />
+        <OnboardingHeader onClick={handlePrev} />
         {currentStep !== 'START' && (
           <div className="w-full">
             <ProgressBar currentStep={currentIndex} totalSteps={steps.length - 1} />
diff --git a/src/pages/onboarding/onboarding.tsx b/src/pages/onboarding/onboarding.tsx
index 2263faae..7d5ee758 100644
--- a/src/pages/onboarding/onboarding.tsx
+++ b/src/pages/onboarding/onboarding.tsx
@@ -46,6 +46,11 @@ const Onboarding = () => {
   const { mutate } = useMutation(matchMutations.MATCH_CONDITION());
 
   const handlePrev = () => {
+    if (currentStep === 'COMPLETE') {
+      navigate(ROUTES.HOME);
+      return;
+    }
+
     if (currentStep === 'VIEWING_STYLE' && selections.SUPPORT_TEAM === NO_TEAM_OPTION) {
       goTo('SUPPORT_TEAM');
     } else {