The present invention is related to an aqueous conditioning composition for hair comprising at least one alkyl ester/amido alkyl amine or alkyl ester/amido alkyl quaternary amine and an aqueous emulsion of divinyldimethicone/dimethicone copolymer. In particular, a conditioning composition for hair comprising at least one compound according to general structureR1-A-R2-Bwherein R1 is a saturated or unsaturated, straight or branched alkyl group with 8 to 24 C atoms, R2 is a straight or branched alkyl group with 1 to 4 C atoms, A is a group selected from O,and B is selected fromwherein R3 and R4 are the same or different is H or an alkyl with 1 to 4 C atoms, hydroxyl alkyl with 1 to 4 C atoms and di hydroxyl alkyl with 2 to 4 C atoms, R5, and R6 are the same or different, an alkyl with 1 to 4 C atoms, hydroxyl alkyl with 1 to 4 C atoms and di hydroxyl alkyl with 2 to 4 C atoms, R7 is an alkyl with 1 to 4 C atoms, hydroxyl alkyl with 1 to 4 C atoms or di hydroxyl alkyl with 2 to 4 C atoms and-R2-A-R1wherein R1, A and R2 have the above meaning and X is chloride, bromide, methosulfate and an aqueous emulsion of divinyldimethicone/dimethicone copolymer with an internal phase viscosity of more than 1×108 mm2/s measured at 0.01 Hz and at approximately 25° C.