diff --git a/apps/agent/entrypoints/app/connect-mcp/useGetMCPServersList.tsx b/apps/agent/entrypoints/app/connect-mcp/useGetMCPServersList.tsx
index 3b748160..bc78dcbf 100644
--- a/apps/agent/entrypoints/app/connect-mcp/useGetMCPServersList.tsx
+++ b/apps/agent/entrypoints/app/connect-mcp/useGetMCPServersList.tsx
@@ -10,7 +10,9 @@ interface McpServerResponse {
 }
 
 const getAllManagedServers = async ([hostUrl]: [hostUrl: string]) => {
-  const response = await fetch(`${hostUrl}/klavis/servers`)
+  const response = await fetch(`${hostUrl}/klavis/servers`, {
+    cache: 'no-store',
+  })
   const servers = (await response.json()) as McpServerResponse
   return servers
 }
@@ -23,6 +25,7 @@ export const useGetMCPServersList = () => {
     getAllManagedServers,
     {
       keepPreviousData: true,
+      revalidateOnFocus: true,
     },
   )
 }
diff --git a/apps/server/src/api/routes/klavis.ts b/apps/server/src/api/routes/klavis.ts
index 2c43de61..9c2bb08d 100644
--- a/apps/server/src/api/routes/klavis.ts
+++ b/apps/server/src/api/routes/klavis.ts
@@ -49,6 +49,7 @@ export function createKlavisRoutes(deps: KlavisRouteDeps) {
   // Chain route definitions for proper Hono RPC type inference
   return new Hono()
     .get('/servers', (c) => {
+      c.header('Cache-Control', 'no-store')
       return c.json({
         servers: OAUTH_MCP_SERVERS,
         count: OAUTH_MCP_SERVERS.length,