diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go
index f96e5b71ac..a18d8ca89b 100644
--- a/core/bloombits/matcher.go
+++ b/core/bloombits/matcher.go
@@ -413,7 +413,8 @@ func (m *Matcher) distributor(dist chan *request, session *MatcherSession) {
 				return
 			}
 			shutdown = nil
-
+		case <-session.quit:
+			return
 		case req := <-dist:
 			// New retrieval request arrived to be distributed to some fetcher process
 			queue := requests[req.bit]