diff --git a/cmd/bsky-users/main.go b/cmd/bsky-users/main.go
index 385f698..34dc791 100644
--- a/cmd/bsky-users/main.go
+++ b/cmd/bsky-users/main.go
@@ -99,7 +99,14 @@ func handler(ctx context.Context, queue *Queue, dbCnx *sql.DB) {
 		eventCount int
 	)
 
+queueLoop:
 	for {
+		select {
+		case <-ctx.Done():
+			break queueLoop
+		default:
+		}
+
 		event, ok := queue.Dequeue()
 		if !ok {
 			time.Sleep(100 * time.Millisecond)