diff --git a/chain/store/store.go b/chain/store/store.go
index c8c82d5ec..8c35e4564 100644
--- a/chain/store/store.go
+++ b/chain/store/store.go
@@ -576,7 +576,10 @@ func (cs *ChainStore) WaitForMessage(ctx context.Context, mcid cid.Cid) (cid.Cid
 
 	for {
 		select {
-		case val := <-tsub:
+		case val, ok := <-tsub:
+			if !ok {
+				return cid.Undef, nil, ctx.Err()
+			}
 			switch val.Type {
 			case HCRevert:
 				continue