diff --git a/public/index.html b/public/index.html
index ede01a6cd..02c292ddf 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1739,7 +1739,7 @@
                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="openai,cohere,custom">
+                                    <div class="range-block" data-source="openai,cohere,mistralai,custom">
                                         <label for="openai_function_calling" class="checkbox_label flexWrap widthFreeExpand">
                                             <input id="openai_function_calling" type="checkbox" />
                                             <span data-i18n="Enable function calling">Enable function calling</span>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 949ebfb51..f542d3f14 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -1968,7 +1968,7 @@ async function registerFunctionTools(type, data) {
 }
 
 async function checkFunctionToolCalls(data) {
-    if ([chat_completion_sources.OPENAI, chat_completion_sources.CUSTOM].includes(oai_settings.chat_completion_source)) {
+    if ([chat_completion_sources.OPENAI, chat_completion_sources.CUSTOM, chat_completion_sources.MISTRALAI].includes(oai_settings.chat_completion_source)) {
         if (!Array.isArray(data?.choices)) {
             return;
         }
@@ -1987,7 +1987,7 @@ async function checkFunctionToolCalls(data) {
         }
 
         for (const toolCall of toolCalls) {
-            if (toolCall.type !== 'function') {
+            if (typeof toolCall.function !== 'object') {
                 continue;
             }
 
@@ -2027,6 +2027,7 @@ export function isFunctionCallingSupported() {
         chat_completion_sources.OPENAI,
         chat_completion_sources.COHERE,
         chat_completion_sources.CUSTOM,
+        chat_completion_sources.MISTRALAI,
     ];
     return supportedSources.includes(oai_settings.chat_completion_source);
 }
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index 5a5e3d5b5..0d91f9657 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -486,6 +486,11 @@ async function sendMistralAIRequest(request, response) {
             'random_seed': request.body.seed === -1 ? undefined : request.body.seed,
         };
 
+        if (Array.isArray(request.body.tools) && request.body.tools.length > 0) {
+            requestBody['tools'] = request.body.tools;
+            requestBody['tool_choice'] = request.body.tool_choice === 'required' ? 'any' : 'auto';
+        }
+
         const config = {
             method: 'POST',
             headers: {