diff --git a/p2p/tracker/tracker.go b/p2p/tracker/tracker.go
index 5b72eb2b88..dd3dba7504 100644
--- a/p2p/tracker/tracker.go
+++ b/p2p/tracker/tracker.go
@@ -185,9 +185,10 @@ func (t *Tracker) Fulfil(peer string, version uint, code uint64, id uint64) {
 		return
 	}
 	// Everything matches, mark the request serviced and meter it
+	wasHead := t.expire.Front() == req.expire
 	t.expire.Remove(req.expire)
 	delete(t.pending, id)
-	if req.expire.Prev() == nil {
+	if wasHead {
 		if t.wake.Stop() {
 			t.schedule()
 		}