diff --git a/apps/code/src/renderer/App.tsx b/apps/code/src/renderer/App.tsx
index a3eea63c7..a5f399743 100644
--- a/apps/code/src/renderer/App.tsx
+++ b/apps/code/src/renderer/App.tsx
@@ -40,9 +40,6 @@ function App() {
   const hasCompletedOnboarding = useOnboardingStore(
     (state) => state.hasCompletedOnboarding,
   );
-  const selectedDirectory = useOnboardingStore(
-    (state) => state.selectedDirectory,
-  );
   const isAuthenticated = authState.status === "authenticated";
   const hasCodeAccess = authState.hasCodeAccess;
   const isDarkMode = useThemeStore((state) => state.isDarkMode);
@@ -217,11 +214,8 @@ function App() {
   }
 
   // Rendering: onboarding (includes auth + invite code gate) → main app
-  // We also route to onboarding when no directory is selected — without one, the
-  // main app has nothing meaningful to show (the dev "Skip setup" button can
-  // produce this state by flipping hasCompletedOnboarding without picking a directory).
   const renderContent = () => {
-    if (!hasCompletedOnboarding || !selectedDirectory) {
+    if (!hasCompletedOnboarding) {
       return (
         <motion.div key="onboarding" initial={{ opacity: 1 }}>
           <OnboardingFlow />
diff --git a/apps/code/src/renderer/features/onboarding/components/OnboardingFlow.tsx b/apps/code/src/renderer/features/onboarding/components/OnboardingFlow.tsx
index 868af1b1b..8c7fb2ca9 100644
--- a/apps/code/src/renderer/features/onboarding/components/OnboardingFlow.tsx
+++ b/apps/code/src/renderer/features/onboarding/components/OnboardingFlow.tsx
@@ -40,11 +40,15 @@ export function OnboardingFlow() {
   const completeOnboarding = useOnboardingStore(
     (state) => state.completeOnboarding,
   );
+  const completeSetup = useOnboardingStore((state) => state.completeSetup);
   const hasCompletedSetup = useOnboardingStore(
     (state) => state.hasCompletedSetup,
   );
   const resetOnboarding = useOnboardingStore((state) => state.resetOnboarding);
   const navigateToSetup = useNavigationStore((state) => state.navigateToSetup);
+  const navigateToTaskInput = useNavigationStore(
+    (state) => state.navigateToTaskInput,
+  );
   const logoutMutation = useLogoutMutation();
   const isAuthenticated = useAuthStateValue(
     (state) => state.status === "authenticated",
@@ -61,6 +65,12 @@ export function OnboardingFlow() {
     }
   };
 
+  const handleSkip = () => {
+    completeOnboarding();
+    completeSetup();
+    navigateToTaskInput();
+  };
+
   const footerRight = (
     <Flex gap="5">
       {isAuthenticated && (
@@ -83,7 +93,7 @@ export function OnboardingFlow() {
           size="1"
           variant="ghost"
           color="gray"
-          onClick={handleComplete}
+          onClick={handleSkip}
           className="opacity-50"
         >
           <ArrowRight size={14} weight="bold" />