diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go
index 6e60cb47d7d6aa149ff3e3cb8069a8fa8caf4e25..9493ad3279eba95178b52b46f9f1275fe827e1e1 100644
--- a/internal/llm/agent/agent.go
+++ b/internal/llm/agent/agent.go
@@ -1107,8 +1107,6 @@ func (a *agent) setupEvents(ctx context.Context) {
 					slog.Warn("MCP client not found for tools/prompts update", "name", name)
 					continue
 				}
-				prevState, _ := mcpStates.Get(name)
-				counts := prevState.Counts
 				switch event.Payload.Type {
 				case MCPEventToolsListChanged:
 					cfg := config.Get()
@@ -1119,10 +1117,8 @@ func (a *agent) setupEvents(ctx context.Context) {
 						_ = c.Close()
 						continue
 					}
-					counts.Tools = len(tools)
 					updateMcpTools(name, tools)
 					a.mcpTools.Reset(maps.Collect(mcpTools.Seq2()))
-					updateMCPState(name, MCPStateConnected, nil, c, counts)
 				case MCPEventPromptsListChanged:
 					prompts, err := getPrompts(ctx, c)
 					if err != nil {
@@ -1131,12 +1127,14 @@ func (a *agent) setupEvents(ctx context.Context) {
 						_ = c.Close()
 						continue
 					}
-					counts.Prompts = len(prompts)
 					updateMcpPrompts(name, prompts)
-					updateMCPState(name, MCPStateConnected, nil, c, counts)
 				default:
 					continue
 				}
+				updateMCPState(name, MCPStateConnected, nil, c, MCPCounts{
+					Tools:   mcpTools.Len(),
+					Prompts: mcpPrompts.Len(),
+				})
 			case <-ctx.Done():
 				slog.Debug("MCPEvents subscription cancelled")
 				return
diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go
index 0b61e9b4f463fec2440653aaa82088129b42e8fe..19e95acc63448334364dd2b7819f541da44775c6 100644
--- a/internal/llm/agent/mcp-tools.go
+++ b/internal/llm/agent/mcp-tools.go
@@ -53,7 +53,6 @@ func (s MCPState) String() string {
 type MCPEventType string
 
 const (
-	MCPEventStateChanged       MCPEventType = "state_changed"
 	MCPEventToolsListChanged   MCPEventType = "tools_list_changed"
 	MCPEventPromptsListChanged MCPEventType = "prompts_list_changed"
 )
@@ -252,15 +251,6 @@ func updateMCPState(name string, state MCPState, err error, client *mcp.ClientSe
 		mcpClients.Del(name)
 	}
 	mcpStates.Set(name, info)
-
-	// Publish state change event
-	mcpBroker.Publish(pubsub.UpdatedEvent, MCPEvent{
-		Type:   MCPEventStateChanged,
-		Name:   name,
-		State:  state,
-		Error:  err,
-		Counts: counts,
-	})
 }
 
 // CloseMCPClients closes all MCP clients. This should be called during application shutdown.