diff --git a/consensus/state.go b/consensus/state.go
index 78d528d09..a3196a2f4 100644
--- a/consensus/state.go
+++ b/consensus/state.go
@@ -320,10 +320,7 @@ func (cs *ConsensusState) OnStop() {
 
 	cs.timeoutTicker.Stop()
 
-	// Make BaseService.Wait() wait until cs.wal.Wait()
-	if cs.IsRunning() {
-		cs.wal.Wait()
-	}
+	cs.wal.Stop()
 }
 
 // Wait waits for the the main routine to return.