diff --git a/server/src/services/business/AuthService.ts b/server/src/services/business/AuthService.ts
index c727fd3cb..daa119053 100644
--- a/server/src/services/business/AuthService.ts
+++ b/server/src/services/business/AuthService.ts
@@ -436,7 +436,7 @@ class AuthService implements IAuthService {
       throw new ApiError("Organization entitlement error");
     }
 
-    const orgRoles = await this.roleRepository.findById(
+    const orgRoles = await this.roleRepository.findByIdAndOrgId(
       orgMembership.roleId || "",
       org.id
     );
diff --git a/server/src/services/business/InviteService.ts b/server/src/services/business/InviteService.ts
index 7b75b761b..6535dcbb7 100644
--- a/server/src/services/business/InviteService.ts
+++ b/server/src/services/business/InviteService.ts
@@ -55,7 +55,10 @@ class InviteService implements IInviteService {
     teamRoleId: string
   ) => {
     try {
-      const role = await this.roleRepository.findById(teamRoleId, orgId);
+      const role = await this.roleRepository.findByIdAndOrgId(
+        teamRoleId,
+        orgId
+      );
 
       if (!role) {
         throw new ApiError("Role not found", 404);
diff --git a/server/src/services/business/MeService.ts b/server/src/services/business/MeService.ts
index 14bb6783d..827b9085c 100644
--- a/server/src/services/business/MeService.ts
+++ b/server/src/services/business/MeService.ts
@@ -72,7 +72,7 @@ class MeService implements IMeService {
       throw new ApiError("Organization not found");
     }
 
-    const orgRole = await this.roleRepository.findById(
+    const orgRole = await this.roleRepository.findByIdAndOrgId(
       orgMembership.roleId || "",
       org.id
     );