The present invention relates to an improved thermal management system for a heat source, such as a high-powered electronic device. Thermal management systems work to maintain the optimal operational temperature of a device to maximise reliability, operational lifespan and/or efficiency, for example by using a fluid coolant to transfer thermal energy from the device to a heat exchanger. The present invention seeks to provide an improved thermal management system by incorporating a phase change material into a heat exchanger.