diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go
index b4494d0d61..af66281769 100644
--- a/whisper/whisperv5/api.go
+++ b/whisper/whisperv5/api.go
@@ -69,20 +69,24 @@ func NewPublicWhisperAPI(w *Whisper) *PublicWhisperAPI {
 // this loop deletes filter that have not been used within filterTimeout
 func (api *PublicWhisperAPI) run() {
 	timeout := time.NewTicker(2 * time.Minute)
+	defer timeout.Stop()
 	for {
-		<-timeout.C
-
-		api.mu.Lock()
-		for id, lastUsed := range api.lastUsed {
-			if time.Since(lastUsed).Seconds() >= filterTimeout {
-				delete(api.lastUsed, id)
-				if err := api.w.Unsubscribe(id); err != nil {
-					log.Error("could not unsubscribe whisper filter", "error", err)
+		select {
+		case <-api.w.quit:
+			return
+		case <-timeout.C:
+			api.mu.Lock()
+			for id, lastUsed := range api.lastUsed {
+				if time.Since(lastUsed).Seconds() >= filterTimeout {
+					delete(api.lastUsed, id)
+					if err := api.w.Unsubscribe(id); err != nil {
+						log.Error("could not unsubscribe whisper filter", "error", err)
+					}
+					log.Debug("delete whisper filter (timeout)", "id", id)
 				}
-				log.Debug("delete whisper filter (timeout)", "id", id)
 			}
+			api.mu.Unlock()
 		}
-		api.mu.Unlock()
 	}
 }
 
diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go
index a2c75a41c7..4c1bb55c19 100644
--- a/whisper/whisperv6/api.go
+++ b/whisper/whisperv6/api.go
@@ -70,20 +70,24 @@ func NewPublicWhisperAPI(w *Whisper) *PublicWhisperAPI {
 // this loop deletes filter that have not been used within filterTimeout
 func (api *PublicWhisperAPI) run() {
 	timeout := time.NewTicker(2 * time.Minute)
+	defer timeout.Stop()
 	for {
-		<-timeout.C
-
-		api.mu.Lock()
-		for id, lastUsed := range api.lastUsed {
-			if time.Since(lastUsed).Seconds() >= filterTimeout {
-				delete(api.lastUsed, id)
-				if err := api.w.Unsubscribe(id); err != nil {
-					log.Error("could not unsubscribe whisper filter", "error", err)
+		select {
+		case <-api.w.quit:
+			return
+		case <-timeout.C:
+			api.mu.Lock()
+			for id, lastUsed := range api.lastUsed {
+				if time.Since(lastUsed).Seconds() >= filterTimeout {
+					delete(api.lastUsed, id)
+					if err := api.w.Unsubscribe(id); err != nil {
+						log.Error("could not unsubscribe whisper filter", "error", err)
+					}
+					log.Debug("delete whisper filter (timeout)", "id", id)
 				}
-				log.Debug("delete whisper filter (timeout)", "id", id)
 			}
+			api.mu.Unlock()
 		}
-		api.mu.Unlock()
 	}
 }