An exhaust heat recovery system. The system includes a heat exchanger configured to transfer heat from engine exhaust to a heat transfer fluid. A reservoir is in fluid communication with the heat exchanger. A pump is configured to pump the heat transfer fluid out of the heat exchanger and into the reservoir, and in doing so displace air out of the reservoir to the heat exchanger, when temperature of the heat transfer fluid exceeds a predetermined temperature.