diff --git a/piece.go b/piece.go
index 5db87d6a..d29d1dc8 100644
--- a/piece.go
+++ b/piece.go
@@ -94,6 +94,7 @@ func (p *Piece) numDirtyChunks() (ret int) {
 
 func (p *Piece) unpendChunkIndex(i int) {
 	p.dirtyChunks.Add(i)
+	p.t.tickleReaders()
 }
 
 func (p *Piece) pendChunkIndex(i int) {
diff --git a/reader.go b/reader.go
index 40241e07..c8eae097 100644
--- a/reader.go
+++ b/reader.go
@@ -147,7 +147,7 @@ func (r *reader) ReadContext(ctx context.Context, b []byte) (n int, err error) {
 			<-ctx.Done()
 			r.t.cl.mu.Lock()
 			ctxErr = ctx.Err()
-			r.t.cl.event.Broadcast()
+			r.t.tickleReaders()
 			r.t.cl.mu.Unlock()
 		}()
 	}
diff --git a/torrent.go b/torrent.go
index a23029bc..69ad0ca0 100644
--- a/torrent.go
+++ b/torrent.go
@@ -138,6 +138,10 @@ type Torrent struct {
 	pendingRequests map[request]int
 }
 
+func (t *Torrent) tickleReaders() {
+	t.cl.event.Broadcast()
+}
+
 // Returns a channel that is closed when the Torrent is closed.
 func (t *Torrent) Closed() <-chan struct{} {
 	return t.closed.LockedChan(&t.cl.mu)
@@ -672,6 +676,7 @@ func (t *Torrent) numPiecesCompleted() (num int) {
 
 func (t *Torrent) close() (err error) {
 	t.closed.Set()
+	t.tickleReaders()
 	if t.storage != nil {
 		t.storageLock.Lock()
 		t.storage.Close()
@@ -1078,6 +1083,7 @@ func (t *Torrent) updatePieceCompletion(piece int) {
 	log.Fmsg("piece %d completion: %v", piece, pcu.Ok).AddValue(debugLogValue).Log(t.logger)
 	p.storageCompletionOk = pcu.Ok
 	t.completedPieces.Set(piece, pcu.Complete)
+	t.tickleReaders()
 	// log.Printf("piece %d uncached completion: %v", piece, pcu.Complete)
 	// log.Printf("piece %d changed: %v", piece, changed)
 	if changed {