A hair care composition obtainable by blending a conditioning gel phase with an aqueous emulsion of a non-linear organopolysiloxane comprising monomer units of silsesquioxane having a formula (RSi03/2)n where n = 1, R is an alkyl group, preferably methyl, ethyl or propyl, and copolymer segments of polydialkylsiloxane； the conditioning gel phase being formed from a cationic surfactant, a high melting point (25°C or higher) fatty compound and an aqueous carrier； and the aqueous emulsion of the non-linear organopolysiloxane having an aqueous continuous phase consisting of water and a blend of non-ionic and cationic surfactants and a dispersed phase consisting of the non-linear organopolysiloxane and a hydrocarbon oil, wherein the weight ratio of the non-linear organopolysiloxane to the hydrocarbon oil is 40:60 to 65:35. Alternatively, the aqueous continuous phase consists of water and a cationic surfactant.
