A thermal management system for a vehicle powertrain includes a heater core, a transmission fluid warmer selectively in thermal communication with the heater core, a bypass valve between the heater core and transmission fluid warmer configured to control fluid flow therebetween, a control module configured to control the bypass valve, and a timer linked to the control module configured to delay deactivation of the bypass valve.