diff --git a/internal/tui/components/chat/messages/renderer.go b/internal/tui/components/chat/messages/renderer.go
index 1bc586de56eaa9aa13d029c9a87381524c43e1fb..89deb7b8ea2e0310ff3cba7343a6c1ebfe917682 100644
--- a/internal/tui/components/chat/messages/renderer.go
+++ b/internal/tui/components/chat/messages/renderer.go
@@ -502,7 +502,7 @@ func (tr agentRenderer) Render(v *toolCallCmp) string {
 	prompt = strings.ReplaceAll(prompt, "\n", " ")
 
 	header := tr.makeHeader(v, "Agent", v.textWidth())
-	if res, done := earlyState(header, v); done {
+	if res, done := earlyState(header, v); v.cancelled && done {
 		return res
 	}
 	taskTag := t.S().Base.Padding(0, 1).MarginLeft(1).Background(t.BlueLight).Foreground(t.White).Render("Task")
@@ -527,6 +527,7 @@ func (tr agentRenderer) Render(v *toolCallCmp) string {
 	parts := []string{
 		childTools.Enumerator(RoundedEnumerator).String(),
 	}
+
 	if v.result.ToolCallID == "" {
 		v.spinning = true
 		parts = append(parts, v.anim.View().String())