Manage consequences of race condition in get_queue

Need to investigate later on hom to avoid the race condition