diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go
index 68fa7c8cba..e3bba4dd89 100644
--- a/whisper/whisperv6/peer.go
+++ b/whisper/whisperv6/peer.go
@@ -57,7 +57,7 @@ func newPeer(host *Whisper, remote *p2p.Peer, rw p2p.MsgReadWriter) *Peer {
 		trusted:        false,
 		powRequirement: 0.0,
 		known:          mapset.NewSet(),
-		quit:           make(chan struct{}),
+		quit:           make(chan struct{}, 1),
 		bloomFilter:    MakeFullNodeBloom(),
 		fullNode:       true,
 	}
diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index 377406b360..ce68f30098 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -106,7 +106,7 @@ func New(cfg *Config) *Whisper {
 		peers:         make(map[*Peer]struct{}),
 		messageQueue:  make(chan *Envelope, messageQueueLimit),
 		p2pMsgQueue:   make(chan *Envelope, messageQueueLimit),
-		quit:          make(chan struct{}),
+		quit:          make(chan struct{}, 1),
 		syncAllowance: DefaultSyncAllowance,
 	}