Fix race condition during restore/load phase of client side boot