A model of a thermal storage tank in which stored energy is extracted via an immersed heat exchanger is presented and used to predict transient temperature and velocity fields in tanks with and without baffles. The heat exchanger is modeled as a porous medium within the storage fluid. A simple cylindrical baffle that creates an annular space in which a coiled tube heat exchanger is positioned provides a modest increase in the rate of energy extraction compared to a tank with no baffle. The improved discharge rate is attributed to an increase in the flow speed across the heat exchanger. A baffle with greater hydraulic resistance slows the flow and reduces performance.