diff --git a/frontend/src/core/api/api-client.ts b/frontend/src/core/api/api-client.ts
index 72f237c..b862515 100644
--- a/frontend/src/core/api/api-client.ts
+++ b/frontend/src/core/api/api-client.ts
@@ -30,8 +30,15 @@ function createCompatibleClient(isMock?: boolean): LangGraphClient {
   return client;
 }
 
-let _singleton: LangGraphClient | null = null;
+const _clients = new Map<string, LangGraphClient>();
 export function getAPIClient(isMock?: boolean): LangGraphClient {
-  _singleton ??= createCompatibleClient(isMock);
-  return _singleton;
+  const cacheKey = isMock ? "mock" : "default";
+  let client = _clients.get(cacheKey);
+
+  if (!client) {
+    client = createCompatibleClient(isMock);
+    _clients.set(cacheKey, client);
+  }
+
+  return client;
 }