An aqueous hair conditioner composition comprising: a) a cationic conditioning surfactant, b) discrete, dispersed droplets comprising a water-insoluble conditioning oil and c) a block copolymer with a mean molecular weight of 1000 unified atomic mass units or more, comprising polyethyleneoxide and polypropyleneoxide blocks selected from the group consisting of (i) poloxamers according to formula (I), wherein the mean value of (y) is from 18 to 60 and the mean value (x) is from 7 to 140 such that the mean value of the ratio (x/y) is from 0.4 to 3.0 and (ii) poloxamines according to formula (II), wherein the mean value of (a) is 2 or more and the mean value of (b) is 2 or more.