Don't click to replenish ranks straight away, give it 2-3 minutes which will minimize them rejoining, not perfect solution, but it is a work around we can use atm.