diff --git a/client/server/status_stream.go b/client/server/status_stream.go
index ac5d5f8fb..a53c39d2a 100644
--- a/client/server/status_stream.go
+++ b/client/server/status_stream.go
@@ -73,6 +73,14 @@ func collectStatusBurst(ctx context.Context, ch <-chan struct{}) (pending, open
 			}
 			pending = true
 		case <-timer.C:
+			select {
+			case _, ok := <-ch:
+				if !ok {
+					return pending, false
+				}
+				pending = true
+			default:
+			}
 			return pending, true
 		case <-ctx.Done():
 			return false, false