diff --git a/internal/bft/viewchanger.go b/internal/bft/viewchanger.go
index 96172260..505c921a 100644
--- a/internal/bft/viewchanger.go
+++ b/internal/bft/viewchanger.go
@@ -1320,7 +1320,13 @@ func (v *ViewChanger) Decide(proposal types.Proposal, signatures []types.Signatu
 		}
 	}
 	v.Pruner.MaybePruneRevokedRequests()
-	v.inFlightDecideChan <- struct{}{}
+
+	select {
+	case v.inFlightDecideChan <- struct{}{}:
+		return
+	case <-v.stopChan:
+		return
+	}
 }
 
 // Complain panics when a view change is requested