diff --git a/mining.go b/mining.go
index 89d544e9..0dbab0fb 100644
--- a/mining.go
+++ b/mining.go
@@ -3127,7 +3127,12 @@ func (g *BgBlkTmplGenerator) regenHandler(ctx context.Context) {
 	if err != nil {
 		g.setCurrentTemplate(nil, turUnknown, err)
 	} else {
-		g.queueRegenEvent <- regenEvent{rtBlockConnected, tipBlock}
+		select {
+		case <-ctx.Done():
+			g.wg.Done()
+			return
+		case g.queueRegenEvent <- regenEvent{rtBlockConnected, tipBlock}:
+		}
 	}
 
 	state := makeRegenHandlerState()