diff --git a/integration/rpctest/blockgen.go b/integration/rpctest/blockgen.go
index 6c7218f77..de5821b0c 100644
--- a/integration/rpctest/blockgen.go
+++ b/integration/rpctest/blockgen.go
@@ -45,12 +45,20 @@ func solveBlock(header *wire.BlockHeader, targetDifficulty *big.Int) bool {
 				hdr.Nonce = i
 				hash := hdr.BlockHash()
 				if blockchain.HashToBig(&hash).Cmp(targetDifficulty) <= 0 {
-					results <- sbResult{true, i}
-					return
+					select {
+					case results <- sbResult{true, i}:
+						return
+					case <-quit:
+						return
+					}
 				}
 			}
 		}
-		results <- sbResult{false, 0}
+		select {
+		case results <- sbResult{false, 0}:
+		case <-quit:
+			return
+		}
 	}
 
 	startNonce := uint32(0)