diff --git a/node/broadcaster/broadcaster.go b/node/broadcaster/broadcaster.go
index 97391c6..4d34942 100644
--- a/node/broadcaster/broadcaster.go
+++ b/node/broadcaster/broadcaster.go
@@ -160,19 +160,20 @@ func (b *Broadcaster) loadPendingTxs(ctx types.Context, stage types.BasicDB, las
 		pollingTimer := time.NewTicker(ctx.PollingInterval())
 		defer pollingTimer.Stop()
 
+	WAITLOOP:
 		for {
+			if len(pendingTxs) == 0 {
+				return nil
+			}
+
 			select {
 			case <-ctx.Done():
 				return ctx.Err()
 			case <-timer.C:
-				break
+				break WAITLOOP
 			case <-pollingTimer.C:
 			}
 
-			if len(pendingTxs) == 0 {
-				return nil
-			}
-
 			txHash, err := hex.DecodeString(pendingTxs[0].TxHash)
 			if err != nil {
 				return err