diff --git a/client/pages/Onboarding.tsx b/client/pages/Onboarding.tsx
index 0a7acb99..a643eaca 100644
--- a/client/pages/Onboarding.tsx
+++ b/client/pages/Onboarding.tsx
@@ -582,6 +582,13 @@ export default function Onboarding() {
                     }
                     onNext={nextStep}
                   />
+                ) : steps[currentStep].title === "Follow Arms" ? (
+                  <FollowArms
+                    selectedArms={data.followedArms || []}
+                    onUpdate={(arms) => updateData({ followedArms: arms })}
+                    nextStep={nextStep}
+                    prevStep={prevStep}
+                  />
                 ) : (
                   <CurrentStepComponent
                     data={data}