fix: Reset target id after loading saved state

fix: Reset target id after loading saved state #1736