Resolved race condition to enable support for hybrid cloud