diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index f812ae10ab..2abc4b5507 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -111,17 +111,20 @@ router.get('/', async function (req, res) {
     payload.mcpServers = {};
     const config = await getCustomConfig();
     if (config?.mcpServers != null) {
-      const mcpManager = getMCPManager();
-      const oauthServers = mcpManager.getOAuthServers();
-
-      for (const serverName in config.mcpServers) {
-        const serverConfig = config.mcpServers[serverName];
-        payload.mcpServers[serverName] = {
-          startup: serverConfig?.startup,
-          chatMenu: serverConfig?.chatMenu,
-          isOAuth: oauthServers?.has(serverName),
-          customUserVars: serverConfig?.customUserVars || {},
-        };
+      try {
+        const mcpManager = getMCPManager();
+        const oauthServers = mcpManager.getOAuthServers();
+        for (const serverName in config.mcpServers) {
+          const serverConfig = config.mcpServers[serverName];
+          payload.mcpServers[serverName] = {
+            startup: serverConfig?.startup,
+            chatMenu: serverConfig?.chatMenu,
+            isOAuth: oauthServers?.has(serverName),
+            customUserVars: serverConfig?.customUserVars || {},
+          };
+        }
+      } catch (err) {
+        logger.error('Error loading MCP servers', err);
       }
     }
 
diff --git a/api/server/services/initializeMCPs.js b/api/server/services/initializeMCPs.js
index 2293116ff0..0ca402766b 100644
--- a/api/server/services/initializeMCPs.js
+++ b/api/server/services/initializeMCPs.js
@@ -14,22 +14,6 @@ async function initializeMCPs(app) {
     return;
   }
 
-  /** Servers filtered with `startup: false` */
-  const filteredServers = {};
-  for (const [name, config] of Object.entries(mcpServers)) {
-    if (config.startup === false) {
-      logger.info(`Skipping MCP server '${name}' due to startup: false`);
-      continue;
-    }
-    filteredServers[name] = config;
-  }
-
-  if (Object.keys(filteredServers).length === 0) {
-    logger.info('[MCP] No MCP servers to initialize (all skipped or none configured)');
-    return;
-  }
-
-  logger.info('Initializing MCP servers...');
   const mcpManager = await createMCPManager(mcpServers);
 
   try {