diff --git a/api/server/controllers/assistants/helpers.js b/api/server/controllers/assistants/helpers.js
index ad9bc2361b..9183680f1e 100644
--- a/api/server/controllers/assistants/helpers.js
+++ b/api/server/controllers/assistants/helpers.js
@@ -185,7 +185,7 @@ const listAssistantsForAzure = async ({ req, res, version, azureConfig = {}, que
  * @returns {Promise<{ openai: OpenAI, openAIApiKey: string }>} - The initialized OpenAI SDK client.
  */
 async function getOpenAIClient({ req, res, endpointOption, initAppClient, overrideEndpoint }) {
-  let endpoint = overrideEndpoint ?? req.body.endpoint ?? req.query.endpoint;
+  let endpoint = overrideEndpoint ?? req.body?.endpoint ?? req.query?.endpoint;
   const version = await getCurrentVersion(req, endpoint);
   if (!endpoint) {
     throw new Error(`[${req.baseUrl}] Endpoint is required`);
diff --git a/api/server/controllers/assistants/v1.js b/api/server/controllers/assistants/v1.js
index 53566f2a24..32842deb0f 100644
--- a/api/server/controllers/assistants/v1.js
+++ b/api/server/controllers/assistants/v1.js
@@ -259,7 +259,7 @@ function filterAssistantDocs({ documents, userId, assistantsConfig = {} }) {
 const getAssistantDocuments = async (req, res) => {
   try {
     const appConfig = req.config;
-    const endpoint = req.query;
+    const endpoint = req.query?.endpoint;
     const assistantsConfig = appConfig.endpoints?.[endpoint];
     const documents = await getAssistants(
       {},