diff --git a/eth/protocols/eth/dispatcher.go b/eth/protocols/eth/dispatcher.go
index 42d08573c1..76546cdf67 100644
--- a/eth/protocols/eth/dispatcher.go
+++ b/eth/protocols/eth/dispatcher.go
@@ -230,6 +230,11 @@ func (p *Peer) dispatcher() {
 			}
 			// Stop tracking the request
 			delete(pending, cancelOp.id)
+
+			// Not sure if the request is about the receipt, but removing it anyway
+			delete(p.receiptBuffer, cancelOp.id)
+			delete(p.requestedReceipts, cancelOp.id)
+
 			cancelOp.fail <- nil
 
 		case resOp := <-p.resDispatch: