diff --git a/diagnostics/diag.go b/diagnostics/diag.go
index da76a6fb006..4022b859004 100644
--- a/diagnostics/diag.go
+++ b/diagnostics/diag.go
@@ -191,7 +191,11 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer
 				return
 			}
 			for d := range out {
-				respdata <- d
+				select {
+				case respdata <- d:
+				case <-ctx.Done():
+					return
+				}
 			}
 		}(p)
 	}