diff --git a/support/bundler/bundler.go b/support/bundler/bundler.go
index fc515e4..8c9693b 100644
--- a/support/bundler/bundler.go
+++ b/support/bundler/bundler.go
@@ -182,7 +182,7 @@
 	// (We could try to call Reset on the timer instead, but that would add a lot
 	// of complexity to the code just to save one small allocation.)
 	if b.flushTimer == nil {
-		b.flushTimer = time.AfterFunc(b.DelayThreshold, b.Flush)
+		b.flushTimer = time.AfterFunc(b.DelayThreshold, b.flushWithoutWait)
 	}
 
 	// If the current bundle equals the count threshold, close it.
@@ -226,6 +226,14 @@
 	return nil
 }
 
+// flushWithoutWait forces the current bundle to be be flushed if non-empty (but
+// doesn't wait for any bundles to actually be handled).
+func (b *Bundler) flushWithoutWait() {
+	b.mu.Lock()
+	b.startFlushLocked()
+	b.mu.Unlock()
+}
+
 // Flush invokes the handler for all remaining items in the Bundler and waits
 // for it to return.
 func (b *Bundler) Flush() {