update

backend/app/auth_routes.py

@@ -240,6 +240,13 @@ async def auth_me(request: Request, db: Session = Depends(get_db)):
         if cur_tid is not None and int(cur_tid) == tid:
             current_role = m.role
 
+    # Keep session aligned with DB when current_tenant_id is missing or no longer valid.
+    if current_role is None and memberships:
+        m0, t0 = min(memberships, key=lambda mt: (int(mt[1].id), int(mt[0].id)))
+        request.session["current_tenant_id"] = int(t0.id)
+        cur_tid = int(t0.id)
+        current_role = m0.role
+
     return {
         **profile,
         "user_id": uid,

backend/app/tenant_deps.py

@@ -22,20 +22,32 @@ async def get_tenant_context(request: Request, db: Session = Depends(get_db)) ->
     uid = request.session.get("user_id")
     if uid is None:
         raise HTTPException(status_code=401, detail="Sign in required")
-    tid = request.session.get("current_tenant_id")
-    if tid is None:
-        raise HTTPException(status_code=400, detail="No workspace selected")
-    m = (
+    uid_i = int(uid)
+
+    memberships = (
         db.query(TenantMembership)
-        .filter(
-            TenantMembership.user_id == int(uid),
-            TenantMembership.tenant_id == int(tid),
-        )
-        .first()
+        .filter(TenantMembership.user_id == uid_i)
+        .order_by(TenantMembership.id)
+        .all()
     )
-    if not m:
-        raise HTTPException(status_code=403, detail="You are not a member of this workspace")
-    return TenantContext(tenant_id=int(tid), user_id=int(uid), role=m.role, db=db)
+    if not memberships:
+        raise HTTPException(
+            status_code=400,
+            detail="No workspace membership. Sign out and sign in again, or use an invite link.",
+        )
+
+    tid_session = request.session.get("current_tenant_id")
+    m = None
+    if tid_session is not None:
+        tid_i = int(tid_session)
+        m = next((x for x in memberships if int(x.tenant_id) == tid_i), None)
+
+    # Session pointed at a tenant the user no longer belongs to (stale cookie / DB reset / HF volume).
+    if m is None:
+        m = memberships[0]
+        request.session["current_tenant_id"] = int(m.tenant_id)
+
+    return TenantContext(tenant_id=int(m.tenant_id), user_id=uid_i, role=m.role, db=db)
 
 
 async def require_tenant_admin(tc: TenantContext = Depends(get_tenant_context)) -> TenantContext:

frontend/src/components/layout/AppShell.jsx

@@ -42,7 +42,7 @@ export default function AppShell({ title, subtitle, rightContent, children }) {
         };
         syncSettingsNav();
         window.addEventListener('emailout-auth-changed', syncSettingsNav);
-        return () => window.removeEventListener('emailout-auth-changed', syncAdminNav);
+        return () => window.removeEventListener('emailout-auth-changed', syncSettingsNav);
     }, []);
 
     const navItems = useMemo(