diff --git a/Common/UI/Utils/ModelAPI/ModelAPI.ts b/Common/UI/Utils/ModelAPI/ModelAPI.ts index e394bbb6db..4df3cb4ef3 100644 --- a/Common/UI/Utils/ModelAPI/ModelAPI.ts +++ b/Common/UI/Utils/ModelAPI/ModelAPI.ts @@ -333,6 +333,14 @@ export default class ModelAPI { if (project && project.id) { headers["tenantid"] = project.id.toString(); + } else { + // Fallback to getCurrentProjectId() when full project data is not yet loaded + // This can happen after SSO login when the project ID is available in URL/SessionStorage + // but the full project data hasn't been fetched yet + const projectId: ObjectID | null = ProjectUtil.getCurrentProjectId(); + if (projectId) { + headers["tenantid"] = projectId.toString(); + } } }