diff --git a/api/strategies/openidStrategy.js b/api/strategies/openidStrategy.js
index f33fdb82ad..2d7957639d 100644
--- a/api/strategies/openidStrategy.js
+++ b/api/strategies/openidStrategy.js
@@ -526,7 +526,7 @@ async function applyOpenIdRoleSync({
 
   /** Role definitions are tenant-scoped, so validate configured roles in the matched user's tenant. */
   const { rolePriority, fallbackRole } = user?.tenantId
-    ? await tenantStorage.run({ tenantId: user.tenantId }, () =>
+    ? await tenantStorage.run({ tenantId: user.tenantId }, async () =>
         getLibreChatRolesForOpenIdSync(libreChatRoles),
       )
     : await getLibreChatRolesForOpenIdSync(libreChatRoles);
diff --git a/packages/api/src/middleware/remoteAgentAuth.ts b/packages/api/src/middleware/remoteAgentAuth.ts
index 7e7dc483c4..49b160d4dc 100644
--- a/packages/api/src/middleware/remoteAgentAuth.ts
+++ b/packages/api/src/middleware/remoteAgentAuth.ts
@@ -487,7 +487,7 @@ async function selectOpenIdRoleForOpenIdSync(
     return;
   }
 
-  const loadLibreChatRoles = () =>
+  const loadLibreChatRoles = async () =>
     getLibreChatRolesForOpenIdSync({
       getRolesByNames,
       rolePriority: options.rolePriority,
@@ -523,7 +523,7 @@ async function updateResolvedUser(
     return;
   }
 
-  const update = () => updateUser(userResolution.user.id, userResolution.updateData);
+  const update = async () => updateUser(userResolution.user.id, userResolution.updateData);
   if (userResolution.user.tenantId && getTenantId() !== userResolution.user.tenantId) {
     await tenantStorage.run({ tenantId: userResolution.user.tenantId }, update);
     return;
diff --git a/packages/data-schemas/src/methods/role.ts b/packages/data-schemas/src/methods/role.ts
index 57f78ce51a..8e593704c9 100644
--- a/packages/data-schemas/src/methods/role.ts
+++ b/packages/data-schemas/src/methods/role.ts
@@ -8,6 +8,7 @@ import {
 import type { Model } from 'mongoose';
 import type { IRole, IUser } from '~/types';
 import { scopedCacheKey } from '~/config/tenantContext';
+import { escapeRegExp } from '~/utils/string';
 import logger from '~/config/winston';
 
 const systemRoleValues = new Set<string>(Object.values(SystemRoles));
@@ -17,10 +18,6 @@ function isSystemRoleName(name: string): boolean {
   return systemRoleValues.has(name.toUpperCase());
 }
 
-function escapeRegex(value: string): string {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
 export class RoleConflictError extends Error {
   constructor(message: string) {
     super(message);
@@ -146,7 +143,7 @@ export function createRoleMethods(mongoose: typeof import('mongoose'), deps: Rol
       const Role = mongoose.models.Role;
       let query = Role.find({
         $or: uniqueRoleNames.map((roleName) => ({
-          name: new RegExp(`^${escapeRegex(roleName)}$`, 'i'),
+          name: new RegExp(`^${escapeRegExp(roleName)}$`, 'i'),
         })),
       });
       if (fieldsToSelect) {