diff --git a/pkg/gateway/mcpadd.go b/pkg/gateway/mcpadd.go
index 2d76e2388..767d86e8b 100644
--- a/pkg/gateway/mcpadd.go
+++ b/pkg/gateway/mcpadd.go
@@ -209,9 +209,9 @@ func addServerHandler(g *Gateway, clientConfig *clientConfig) mcp.ToolHandler {
 		}
 		clientNameLower := strings.ToLower(clientName)
 
-		// Only activate tools if activate is true AND client name doesn't contain "claude"
-		// (Claude clients auto-refresh their tool list, so they don't need explicit activation)
-		shouldActivate := params.Activate && !strings.Contains(clientNameLower, "claude")
+		// Activate tools if requested - all clients need explicit activation
+		// (Removed incorrect assumption that Claude auto-refreshes tool list)
+		shouldActivate := params.Activate // Claude clients also need explicit activation
 
 		if shouldActivate {
 			// Now update g.mcpServer with the new capabilities