Add a timeout (only when there is no peer to query), that way we do not

set number of query to minimum current number peer or configured number
of query : that way capability test was restored.