diff --git a/CHANGELOG.md b/CHANGELOG.md
index 592a7c6b..1842c8e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,7 +89,7 @@ Special thanks to external contributors on this release:
 - [p2p] [\#3247](https://github.com/tendermint/tendermint/issues/3247) Fix panic in SeedMode when calling FlushStop and OnStop
   concurrently
 - [p2p] [\#3040](https://github.com/tendermint/tendermint/issues/3040) Fix MITM on secret connection by checking low-order points
-- [privval] [\#3258](https://github.com/tendermint/tendermint/issues/3258) Fix race between sign requests and ping requests in socket
+- [privval] [\#3258](https://github.com/tendermint/tendermint/issues/3258) Fix race between sign requests and ping requests in socket that was causing messages to be corrupted
 
 ## v0.29.1
 
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 64098583..f23ec5bf 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -21,3 +21,5 @@ Special thanks to external contributors on this release:
 ### IMPROVEMENTS:
 
 ### BUG FIXES:
+- [consensus] \#3297 Flush WAL on stop to prevent data corruption during
+  graceful shutdown
diff --git a/consensus/wal.go b/consensus/wal.go
index d56ede26..26428a4c 100644
--- a/consensus/wal.go
+++ b/consensus/wal.go
@@ -116,6 +116,7 @@ func (wal *baseWAL) OnStart() error {
 // Use Wait() to ensure it's finished shutting down
 // before cleaning up files.
 func (wal *baseWAL) OnStop() {
+	wal.group.Flush()
 	wal.group.Stop()
 	wal.group.Close()
 }