This addresses a bug when we call setup multiple times before its ready [Delivers #83939432]