diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index debd99418..c202eff17 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -2413,7 +2413,7 @@ turnLoop:
 					})
 			}
 
-			if len(toolResult.Media) > 0 {
+			if len(toolResult.Media) > 0 && toolResult.ResponseHandled {
 				parts := make([]bus.MediaPart, 0, len(toolResult.Media))
 				for _, ref := range toolResult.Media {
 					part := bus.MediaPart{Ref: ref}
diff --git a/pkg/agent/loop_test.go b/pkg/agent/loop_test.go
index bca96934c..b7442e2fc 100644
--- a/pkg/agent/loop_test.go
+++ b/pkg/agent/loop_test.go
@@ -522,6 +522,12 @@ func TestProcessMessage_MediaArtifactCanBeForwardedBySendFile(t *testing.T) {
 	default:
 		t.Fatal("expected outbound media from send_file")
 	}
+
+	select {
+	case extra := <-msgBus.OutboundMediaChan():
+		t.Fatalf("expected exactly one outbound media delivery, got extra %+v", extra)
+	default:
+	}
 }
 
 // TestAgentLoop_GetStartupInfo verifies startup info contains tools