Handle state preservation from within the client