diff --git a/eth/filters/api.go b/eth/filters/api.go
index f46dd39dd8..e3057a2af2 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -90,7 +90,11 @@ func (api *FilterAPI) timeoutLoop(timeout time.Duration) {
 	ticker := time.NewTicker(timeout)
 	defer ticker.Stop()
 	for {
-		<-ticker.C
+		select {
+		case <-ticker.C:
+		case <-api.events.chainSub.Err():
+			return
+		}
 		api.filtersMu.Lock()
 		for id, f := range api.filters {
 			select {