ensure hs is saved on voluntary leave aswell