diff --git a/web/components/auth-context.tsx b/web/components/auth-context.tsx
index 7b821d4d..f62c10a2 100644
--- a/web/components/auth-context.tsx
+++ b/web/components/auth-context.tsx
@@ -53,7 +53,7 @@ export function AuthProvider(props: {
           refresh: fbUser.refreshToken,
         })
         let current = await getUserAndPrivateUser(fbUser.uid)
-        if (!current) {
+        if (!current.user || !current.privateUser) {
           const deviceToken = ensureDeviceToken()
           current = (await createUser({ deviceToken })) as UserAndPrivateUser
         }