diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.js
index 74e1343756..f9b49abbca 100644
--- a/api/server/services/Endpoints/agents/initialize.js
+++ b/api/server/services/Endpoints/agents/initialize.js
@@ -149,7 +149,11 @@ const initializeClient = async ({ req, res, signal, endpointOption }) => {
         endpointOption,
         allowedProviders,
       });
-      Object.assign(userMCPAuthMap, config.userMCPAuthMap ?? {});
+      if (userMCPAuthMap != null) {
+        Object.assign(userMCPAuthMap, config.userMCPAuthMap ?? {});
+      } else {
+        userMCPAuthMap = config.userMCPAuthMap;
+      }
       agentConfigs.set(agentId, config);
     }
   }