diff --git a/src/services/KeycloakAttributeService.ts b/src/services/KeycloakAttributeService.ts
index fcc77247..c5759274 100644
--- a/src/services/KeycloakAttributeService.ts
+++ b/src/services/KeycloakAttributeService.ts
@@ -116,12 +116,13 @@ export class KeycloakAttributeService {
       const profileEmployeeResult = await this.profileEmployeeRepo
         .createQueryBuilder("pe")
         .leftJoinAndSelect("pe.current_holders", "epm")
-        .leftJoinAndSelect("epm.orgRoot", "org")
+        .leftJoinAndSelect("epm.orgRoot", "orgRoot")
         .leftJoinAndSelect("epm.orgChild1", "orgChild1")
         .leftJoinAndSelect("epm.orgChild2", "orgChild2")
         .leftJoinAndSelect("epm.orgChild3", "orgChild3")
         .leftJoinAndSelect("epm.orgChild4", "orgChild4")
         .where("pe.keycloak = :keycloakUserId", { keycloakUserId })
+        .andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
         .getOne();
 
       if (
@@ -151,12 +152,13 @@ export class KeycloakAttributeService {
       const profileEmployeeResult = await this.profileEmployeeRepo
         .createQueryBuilder("pe")
         .leftJoinAndSelect("pe.current_holderTemps", "etpm")
-        .leftJoinAndSelect("etpm.orgRoot", "org")
+        .leftJoinAndSelect("etpm.orgRoot", "orgRoot")
         .leftJoinAndSelect("etpm.orgChild1", "orgChild1")
         .leftJoinAndSelect("etpm.orgChild2", "orgChild2")
         .leftJoinAndSelect("etpm.orgChild3", "orgChild3")
         .leftJoinAndSelect("etpm.orgChild4", "orgChild4")
         .where("pe.keycloak = :keycloakUserId", { keycloakUserId })
+        .andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
         .getOne();
 
       if (
@@ -275,12 +277,13 @@ export class KeycloakAttributeService {
         const profileEmployeeResult = await this.profileEmployeeRepo
           .createQueryBuilder("pe")
           .leftJoinAndSelect("pe.current_holders", "epm")
-          .leftJoinAndSelect("epm.orgRoot", "org")
+          .leftJoinAndSelect("epm.orgRoot", "orgRoot")
           .leftJoinAndSelect("epm.orgChild1", "orgChild1")
           .leftJoinAndSelect("epm.orgChild2", "orgChild2")
           .leftJoinAndSelect("epm.orgChild3", "orgChild3")
           .leftJoinAndSelect("epm.orgChild4", "orgChild4")
           .where("pe.id = :profileId", { profileId })
+          .andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
           .getOne();
 
         if (
@@ -311,12 +314,13 @@ export class KeycloakAttributeService {
         const profileEmployeeResult = await this.profileEmployeeRepo
           .createQueryBuilder("pe")
           .leftJoinAndSelect("pe.current_holderTemps", "etpm")
-          .leftJoinAndSelect("etpm.orgRoot", "org")
+          .leftJoinAndSelect("etpm.orgRoot", "orgRoot")
           .leftJoinAndSelect("etpm.orgChild1", "orgChild1")
           .leftJoinAndSelect("etpm.orgChild2", "orgChild2")
           .leftJoinAndSelect("etpm.orgChild3", "orgChild3")
           .leftJoinAndSelect("etpm.orgChild4", "orgChild4")
           .where("pe.id = :profileId", { profileId })
+          .andWhere("orgRoot.orgRevisionId = :revisionId", { revisionId })
           .getOne();
 
         if (