diff --git a/src/components/portal/portal-shell.tsx b/src/components/portal/portal-shell.tsx
index dbfa8c8..0471b2d 100644
--- a/src/components/portal/portal-shell.tsx
+++ b/src/components/portal/portal-shell.tsx
@@ -26,7 +26,7 @@ export function PortalShell({ children }: PortalShellProps) {
   const { session, machineContext, machineContextError, machineContextLoading } = useAuth()
   const [isSigningOut, setIsSigningOut] = useState(false)
 
-  const isMachineSession = session?.user.role === "machine"
+  const isMachineSession = session?.user.role === "machine" || Boolean(machineContext)
   const personaValue = machineContext?.persona ?? session?.user.machinePersona ?? null
   const collaboratorName = machineContext?.assignedUserName?.trim() ?? ""
   const collaboratorEmail = machineContext?.assignedUserEmail?.trim() ?? ""