diff --git a/baseapp/chain_stream.go b/baseapp/chain_stream.go
index 49f08fc96b31..59b9678e0053 100644
--- a/baseapp/chain_stream.go
+++ b/baseapp/chain_stream.go
@@ -11,13 +11,11 @@ type StreamEvents struct {
 }
 
 func (app *BaseApp) AddStreamEvents(height int64, events []abci.Event, flush bool) {
-	go func() {
-		if app.EnableStreamer {
-			app.StreamEvents <- StreamEvents{
-				Events: events,
-				Height: uint64(height),
-				Flush:  flush,
-			}
+	if app.EnableStreamer {
+		app.StreamEvents <- StreamEvents{
+			Events: events,
+			Height: uint64(height),
+			Flush:  flush,
 		}
-	}()
+	}
 }