diff --git a/ee/apps/den-api/src/middleware/organization-context.ts b/ee/apps/den-api/src/middleware/organization-context.ts
index 3ece7243..54158930 100644
--- a/ee/apps/den-api/src/middleware/organization-context.ts
+++ b/ee/apps/den-api/src/middleware/organization-context.ts
@@ -18,7 +18,9 @@ export const resolveOrganizationContextMiddleware: MiddlewareHandler<{
   }
 
   const apiKey = c.get("apiKey")
-  const scopedOrganizationId = getApiKeyScopedOrganizationId(apiKey) ?? getLegacyProxyOrganizationId(c.req.raw.headers)
+  const apiKeyScopedOrganizationId = getApiKeyScopedOrganizationId(apiKey)
+  const legacyProxyOrganizationId = getLegacyProxyOrganizationId(c.req.raw.headers)
+  const scopedOrganizationId = apiKeyScopedOrganizationId ?? legacyProxyOrganizationId
 
   let organizationId = c.get("activeOrganizationId") ?? null
   let organizationSlug = c.get("activeOrganizationSlug") ?? null
@@ -38,7 +40,7 @@ export const resolveOrganizationContextMiddleware: MiddlewareHandler<{
     organizationSlug = scopedOrganizationId ? scopedOrgs[0]?.slug ?? null : resolved.activeOrgSlug
 
     if (shouldHydrateSessionActiveOrganization({
-      scopedOrganizationId,
+      scopedOrganizationId: apiKeyScopedOrganizationId,
       sessionActiveOrganizationId: session?.activeOrganizationId,
       resolvedActiveOrganizationId: organizationId,
     })) {
diff --git a/ee/apps/den-api/src/middleware/user-organizations.ts b/ee/apps/den-api/src/middleware/user-organizations.ts
index 94d4d948..a539d150 100644
--- a/ee/apps/den-api/src/middleware/user-organizations.ts
+++ b/ee/apps/den-api/src/middleware/user-organizations.ts
@@ -59,7 +59,9 @@ export const resolveUserOrganizationsMiddleware: MiddlewareHandler<{
 
   const session = c.get("session")
   const apiKey = c.get("apiKey")
-  const scopedOrganizationId = getApiKeyScopedOrganizationId(apiKey) ?? getLegacyProxyOrganizationId(c.req.raw.headers)
+  const apiKeyScopedOrganizationId = getApiKeyScopedOrganizationId(apiKey)
+  const legacyProxyOrganizationId = getLegacyProxyOrganizationId(c.req.raw.headers)
+  const scopedOrganizationId = apiKeyScopedOrganizationId ?? legacyProxyOrganizationId
   const resolved = await resolveUserOrganizations({
     activeOrganizationId: scopedOrganizationId ?? session?.activeOrganizationId ?? null,
     userId: normalizeDenTypeId("user", user.id),
@@ -75,7 +77,7 @@ export const resolveUserOrganizationsMiddleware: MiddlewareHandler<{
     : resolved.activeOrgSlug
 
   if (shouldHydrateSessionActiveOrganization({
-    scopedOrganizationId,
+    scopedOrganizationId: apiKeyScopedOrganizationId,
     sessionActiveOrganizationId: session?.activeOrganizationId,
     resolvedActiveOrganizationId: activeOrganizationId,
   })) {