diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go
index bffb0592966b566b9129fd77637969ea96dda244..0015e498f986c67dd4477a6fb35e8846c8442b9e 100644
--- a/internal/llm/agent/agent.go
+++ b/internal/llm/agent/agent.go
@@ -374,7 +374,10 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string, attac
 		a.activeRequests.Del(sessionID)
 		cancel()
 		a.Publish(pubsub.CreatedEvent, result)
-		events <- result
+		select {
+		case events <- result:
+		case <-genCtx.Done():
+		}
 		close(events)
 	}()
 	return events, nil