A heat exchanger, in particular for a motor vehicle, comprising: a first conduit for a first fluid, comprising a first manifold, a second manifold, and a plurality of tubes arranged in at least two parallel stacks having a first terminal tube and a second terminal tube opposite to the first terminal tube, the tubes being fluidly connected with the first manifold and the second manifold to provide at least one U-turn for the first fluid; a second conduit for a second fluid comprising a housing body arranged to at least partially encapsulate the first conduit, wherein the second conduit is fluidly isolated from the first conduit and, a baffle plate deployed in-between the stacks of the tubes and the manifolds, enabling a U-turn of the second fluid in the vicinity of the first manifold, characterised in that, the baffle plate comprises a first restricting member protruding towards the first manifold, configured to partially limit the U-turn of the second fluid at the level of the first terminal tubes of the stacks.