Not sure where the code would need to change, but is it possible to start the first status request immediately when we're known to be in recovery mode?