Not loving this logic here either. Let the queues decide what to do.