Fix unecessary synchronizer recovery work