diff --git a/src/features/onboarding/components/CompanyStep.tsx b/src/features/onboarding/components/CompanyStep.tsx
index b4eadf7..e4b19e5 100644
--- a/src/features/onboarding/components/CompanyStep.tsx
+++ b/src/features/onboarding/components/CompanyStep.tsx
@@ -8,11 +8,8 @@ export type CompanyStepProps = {
 
 export const CompanyStep = ({
   connected,
-  agentCount,
   onOpenCompanyBuilder,
 }: CompanyStepProps) => {
-  const canOpenBuilder = connected && agentCount > 0;
-
   return (
     <div className="space-y-4">
       <div className="rounded-lg border border-amber-500/20 bg-amber-500/10 px-4 py-4">
@@ -60,7 +57,7 @@ export const CompanyStep = ({
       </div>
 
       <div className="pt-4">
-        {canOpenBuilder ? (
+        {connected ? (
           <div className="flex justify-center">
             <button
               type="button"
@@ -73,8 +70,7 @@ export const CompanyStep = ({
           </div>
         ) : (
           <div className="rounded-md border border-amber-500/20 bg-amber-500/10 px-4 py-3 text-xs text-amber-100/80">
-            Connect to a runtime and keep at least one planning agent available to generate the
-            company with AI.
+            Connect to a runtime to generate your company with AI.
           </div>
         )}
       </div>
diff --git a/src/features/onboarding/components/OnboardingWizard.tsx b/src/features/onboarding/components/OnboardingWizard.tsx
index 79da229..994d4f3 100644
--- a/src/features/onboarding/components/OnboardingWizard.tsx
+++ b/src/features/onboarding/components/OnboardingWizard.tsx
@@ -88,13 +88,17 @@ export const OnboardingWizard = ({
 
   const goNext = useCallback(() => {
     markComplete(currentStep);
-    const next = getNextStep(currentStep);
+    let next = getNextStep(currentStep);
+    if (next === "agents" && agentCount === 0) {
+      markComplete("agents");
+      next = "company";
+    }
     if (next) {
       setCurrentStep(next);
     } else {
       onComplete();
     }
-  }, [currentStep, markComplete, onComplete]);
+  }, [agentCount, currentStep, markComplete, onComplete]);
 
   const goPrev = useCallback(() => {
     const prev = getPrevStep(currentStep);