diff --git a/api/server/controllers/PluginController.js b/api/server/controllers/PluginController.js
index b3cbc5d9c9..0d21d8c6a5 100644
--- a/api/server/controllers/PluginController.js
+++ b/api/server/controllers/PluginController.js
@@ -6,7 +6,7 @@ const {
   filterUniquePlugins,
   convertMCPToolsToPlugins,
 } = require('@librechat/api');
-const { getCustomConfig, getCachedTools, getAppConfig } = require('~/server/services/Config');
+const { getCachedTools, getAppConfig } = require('~/server/services/Config');
 const { availableTools, toolkits } = require('~/app/clients/tools');
 const { getMCPManager, getFlowStateManager } = require('~/config');
 const { getLogStores } = require('~/cache');
@@ -102,7 +102,7 @@ function createGetServerTools() {
 const getAvailableTools = async (req, res) => {
   try {
     const userId = req.user?.id;
-    const customConfig = await getCustomConfig();
+    const appConfig = await getAppConfig();
     const cache = getLogStores(CacheKeys.CONFIG_STORE);
     const cachedToolsArray = await cache.get(CacheKeys.TOOLS);
     const cachedUserTools = await getCachedTools({ userId });
@@ -117,7 +117,7 @@ const getAvailableTools = async (req, res) => {
     }
 
     let pluginManifest = availableTools;
-    if (customConfig?.mcpServers != null) {
+    if (appConfig?.mcpConfig != null) {
       try {
         const flowsCache = getLogStores(CacheKeys.FLOWS);
         const flowManager = flowsCache ? getFlowStateManager(flowsCache) : null;
@@ -172,7 +172,7 @@ const getAvailableTools = async (req, res) => {
 
       const parts = plugin.pluginKey.split(Constants.mcp_delimiter);
       const serverName = parts[parts.length - 1];
-      const serverConfig = customConfig?.mcpServers?.[serverName];
+      const serverConfig = appConfig?.mcpConfig?.[serverName];
 
       if (!serverConfig?.customUserVars) {
         toolsOutput.push(toolToAdd);
diff --git a/api/server/routes/files/multer.js b/api/server/routes/files/multer.js
index 3769cd14ae..786b852efc 100644
--- a/api/server/routes/files/multer.js
+++ b/api/server/routes/files/multer.js
@@ -4,7 +4,7 @@ const crypto = require('crypto');
 const multer = require('multer');
 const { sanitizeFilename } = require('@librechat/api');
 const { fileConfig: defaultFileConfig, mergeFileConfig } = require('librechat-data-provider');
-const { getCustomConfig, getAppConfig } = require('~/server/services/Config');
+const { getAppConfig } = require('~/server/services/Config');
 
 const storage = multer.diskStorage({
   destination: function (req, file, cb) {
@@ -74,8 +74,8 @@ const createFileFilter = (customFileConfig) => {
 };
 
 const createMulterInstance = async () => {
-  const customConfig = await getCustomConfig();
-  const fileConfig = mergeFileConfig(customConfig?.fileConfig);
+  const appConfig = await getAppConfig();
+  const fileConfig = mergeFileConfig(appConfig?.fileConfig);
   const fileFilter = createFileFilter(fileConfig);
   return multer({
     storage,
diff --git a/api/server/services/MCP.js b/api/server/services/MCP.js
index eb9d91e4cc..36f43b39c5 100644
--- a/api/server/services/MCP.js
+++ b/api/server/services/MCP.js
@@ -18,7 +18,7 @@ const {
 } = require('librechat-data-provider');
 const { findToken, createToken, updateToken } = require('~/models');
 const { getMCPManager, getFlowStateManager } = require('~/config');
-const { getCachedTools, loadCustomConfig } = require('./Config');
+const { getCachedTools, getAppConfig } = require('./Config');
 const { getLogStores } = require('~/cache');
 
 /**
@@ -252,9 +252,8 @@ async function createMCPTool({ req, res, toolKey, provider: _provider }) {
  * @returns {Object} Object containing mcpConfig, appConnections, userConnections, and oauthServers
  */
 async function getMCPSetupData(userId) {
-  const printConfig = false;
-  const config = await loadCustomConfig(printConfig);
-  const mcpConfig = config?.mcpServers;
+  const config = await getAppConfig();
+  const mcpConfig = config?.mcpConfig;
 
   if (!mcpConfig) {
     throw new Error('MCP config not found');