diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 8e8c79e..9fc0d1b 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -231,7 +231,7 @@ export function App() {
   if (location.pathname === "/setup") {
     return (
       <BrandingProvider>
-        <SetupWizard />
+        <SetupWizard onSetupComplete={() => setNeedsSetup(false)} />
       </BrandingProvider>
     );
   }
diff --git a/apps/web/src/pages/SetupWizard.jsx b/apps/web/src/pages/SetupWizard.jsx
index aaaf269..666b67c 100644
--- a/apps/web/src/pages/SetupWizard.jsx
+++ b/apps/web/src/pages/SetupWizard.jsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { useBranding } from "../BrandingContext.js";
 
-export function SetupWizard() {
+export function SetupWizard({ onSetupComplete }) {
   const navigate = useNavigate();
   const { refresh: refreshBranding } = useBranding();
 
@@ -160,6 +160,8 @@ export function SetupWizard() {
         }
         // Refresh branding so the nav bar shows the new business name
         refreshBranding();
+        // Clear needsSetup state in App so the redirect to /admin sticks
+        if (onSetupComplete) onSetupComplete();
       } catch (e) {
         setError("Network error. Please try again.");
         setLoading(false);