diff --git a/src/middleware.ts b/src/middleware.ts
index 2cd0152e6..d8c6f9aa9 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -485,13 +485,19 @@ async function lookupSpaceInMultiIdMode(request: NextRequest, url: URL): Promise
     }
 
     const decoded = jwt.decode(apiToken) as ContentAPITokenPayload;
+    const siteLookupResult =
+        typeof decoded.site === 'string' &&
+        decoded.site &&
+        typeof decoded.organization === 'string' &&
+        decoded.organization
+            ? { site: decoded.site, organization: decoded.organization }
+            : {};
 
     return {
         space: spaceId,
         changeRequest: changeRequestId,
         revision: revisionId,
-        site: decoded.site,
-        organization: decoded.organization,
+        ...siteLookupResult,
         basePath: normalizePathname(basePathParts.join('/')),
         pathname: normalizePathname(pathSegments.join('/')),
         apiToken,