Fixes #27930: improved QueueListener behaviour.