diff --git a/internal/consensus/reactor.go b/internal/consensus/reactor.go
index 05ddeaa61..52e547bf6 100644
--- a/internal/consensus/reactor.go
+++ b/internal/consensus/reactor.go
@@ -349,6 +349,7 @@ func (r *Reactor) broadcastHasVoteMessage(ctx context.Context, vote *types.Vote)
 // upon receiving.
 func (r *Reactor) subscribeToBroadcastEvents() {
 	onStopCh := r.state.getOnStopCh()
+
 	err := r.state.evsw.AddListenerForEvent(
 		listenerIDConsensus,
 		types.EventNewRoundStepValue,
diff --git a/internal/consensus/state.go b/internal/consensus/state.go
index a9b3d59e0..109e90683 100644
--- a/internal/consensus/state.go
+++ b/internal/consensus/state.go
@@ -497,7 +497,7 @@ func (cs *State) getOnStopCh() chan *cstypes.RoundState {
 	cs.mtx.RLock()
 	defer cs.mtx.RUnlock()
 
-	return r.state.onStopCh
+	return cs.onStopCh
 }
 
 // OnStop implements service.Service.