Fixed an issue with the new clearing the queue logic that was occurring when clearing the queue is successful.