The invention concerns methods and systems for minimizing back-mixing of feedstock flow in converting oxygenates to olefins. In one embodiment, back- mixing is reduced by providing a reactor that includes baffles to reduce the hydraulic diameter of at least a portion of the reactor. Some or all of the baffles can also serve as cooling tubes for reducing temperature gradients in the reactor, and thereby maximize light olefin production.