diff --git a/pkg/ccl/changefeedccl/testfeed_test.go b/pkg/ccl/changefeedccl/testfeed_test.go
index 9db7d592c6d2..d42f8be30c3d 100644
--- a/pkg/ccl/changefeedccl/testfeed_test.go
+++ b/pkg/ccl/changefeedccl/testfeed_test.go
@@ -1608,7 +1608,10 @@ func (s *fakeKafkaSink) Dial() error {
 						return err
 					}
 				}
-				s.feedCh <- m
+				select {
+				case s.feedCh <- m:
+				case <-s.tg.done:
+				}
 				return nil
 			},
 		}}, nil