diff --git a/apps/api-gateway/src/lib/fedcm-cookie.ts b/apps/api-gateway/src/lib/fedcm-cookie.ts
index 289ffdd..e90f495 100644
--- a/apps/api-gateway/src/lib/fedcm-cookie.ts
+++ b/apps/api-gateway/src/lib/fedcm-cookie.ts
@@ -179,7 +179,7 @@ export async function attachFedcmCookieFromAuthResult(
   }
 
   const userId = data.user?.id;
-  if (!userId) return;
+  if (!userId || !data.sessionId) return;
 
   await setFedcmSessionCookie(res, jwt, {
     sub: userId,