diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index eeaebf490..c3105c026 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -28,3 +28,4 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi
 - [blockchain/v1] [\#5701](https://github.com/tendermint/tendermint/pull/5701) Handle peers without blocks (@melekes)
 - [blockchain/v1] \#5711 Fix deadlock (@melekes)
 - [proxy] \#5078 Fix a bug, where TM does not exit when ABCI app crashes (@melekes)
+- [evidence] \#6068 Terminate broadcastEvidenceRoutine when peer is stopped (@melekes)
diff --git a/evidence/reactor.go b/evidence/reactor.go
index d0885fd55..9a67942bc 100644
--- a/evidence/reactor.go
+++ b/evidence/reactor.go
@@ -129,6 +129,8 @@ func (evR *Reactor) broadcastEvidenceRoutine(peer p2p.Peer) {
 			case <-evR.Quit():
 				return
 			}
+		} else if !peer.IsRunning() || !evR.IsRunning() {
+			return
 		}
 
 		ev := next.Value.(types.Evidence)