diff --git a/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx b/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx
index 97cb30ba5..ffb0dd0a1 100644
--- a/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx
+++ b/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx
@@ -6,10 +6,18 @@ import { Button } from "@/src/components/Button/Button";
 import { Divider } from "@/src/components/Divider/Divider";
 import { Logo } from "@/src/components/Logo/Logo";
 import { navigateToClan, selectClanFolder } from "@/src/hooks/clan";
+import { activeClanURI } from "@/src/stores/clan";
 
 export const Onboarding: Component<RouteSectionProps> = (props) => {
   const navigate = useNavigate()
 
+  const activeURI = activeClanURI();
+  if (activeURI) {
+    // the user has already selected a clan, so we should navigate to it
+    console.log("active clan detected, navigating to it", activeURI);
+    navigateToClan(navigate, activeURI);
+  }
+
   const selectFolder = async () => {
     const uri = await selectClanFolder();
     navigateToClan(navigate, uri);