Fix race-condition at client's startup