A hair conditioning composition comprising: a) a silicone polymer comprising: i. one or more quaternary groups; ii. at least one silicone block comprising greater than 200 siloxane units; iii. at least one polyalkylene oxide structural unit; and iv. at least one terminal ester group wherein said silicone polymer has a viscosity of from 500 to 10,000 mPa.s at 20°C as determined by a plate-plate system, plate diameter 40mm, gap width 0.5 mm, wherein said silicone polymer is a pre-emulsified dispersion with a particle size of less than 1 micron, and b) a gel matrix comprising: i. a cationic surfactant; ii. a high melting point fatty compound; and iii. an aqueous carrier wherein said silicone polymer is defined by the following chemical structure: M-Y-[-(N + R 2 -T-N + R 2)-Y-] m -[-(N + R 2 2 -A-E-A'-N + R 2 2)-Y-] k -M (Ib) wherein: m is an average value of from above 0 to 10; k is an average value of from above 0 to 10; M is -OC -Z, wherein Z is a hydrocarbon chain having up to 40 carbon atoms, wherein A and A' each are independently selected from a single bond or a divalent organic group having up to 10 carbon atoms and one or more hetero atoms, and E is a polyalkylene oxide group of the general formula: - [CH 2 CH 2 O] q -[CH 2 CH(CH 3)O] r -[CH 2 CH(C 2 H 5)O] s - with q = 0 to 50, r = 0 to 50, s = 0, and q+r is at least 1, R is selected from monovalent organic groups having up to 22 carbon atoms and optionally one or more heteroatoms, and wherein the free valencies at the nitrogen atoms are bound to carbon atoms, R 2 is methyl; Y is a group of the formula: -K-S-K- and -A-E-A'-or-A'-E-A-, with S= wherein R 1 = C 1 -C 22 -alkyl, C 1 -C 22 -fluoralkyl or aryl, n = 300 to 500, K is a bivalent or trivalent straight chain, cyclic and/or branched C2-C40 hydrocarbon residue which is optionally interrupted by -O-, -NH-, trivalent N, -NR 1 -, -C -, -C -, and optionally substituted with -OH, wherein T is selected from a divalent organic group having up to 20 carbon atoms and one or more hetero atoms. a) a silicone polymer comprising: i. one or more quaternary groups; ii. at least one silicone block comprising greater than 200 siloxane units; iii. at least one polyalkylene oxide structural unit; and iv. at least one terminal ester group wherein said silicone polymer has a viscosity of from 500 to 10,000 mPa.s at 20°C as determined by a plate-plate system, plate diameter 40mm, gap width 0.5 mm, wherein said silicone polymer is a pre-emulsified dispersion with a particle size of less than 1 micron, and i. one or more quaternary groups; ii. at least one silicone block comprising greater than 200 siloxane units; iii. at least one polyalkylene oxide structural unit; and iv. at least one terminal ester group wherein said silicone polymer has a viscosity of from 500 to 10,000 mPa.s at 20°C as determined by a plate-plate system, plate diameter 40mm, gap width 0.5 mm, wherein said silicone polymer is a pre-emulsified dispersion with a particle size of less than 1 micron, and b) a gel matrix comprising: i. a cationic surfactant; ii. a high melting point fatty compound; and iii. an aqueous carrier i. a cationic surfactant; ii. a high melting point fatty compound; and iii. an aqueous carrier m is an average value of from above 0 to 10; k is an average value of from above 0 to 10; M is -OC -Z, wherein Z is a hydrocarbon chain having up to 40 carbon atoms, wherein A and A' each are independently selected from a single bond or a divalent organic group having up to 10 carbon atoms and one or more hetero atoms, and E is a polyalkylene oxide group of the general formula: - [CH 2 CH 2 O] q -[CH 2 CH(CH 3)O] r -[CH 2 CH(C 2 H 5)O] s - with q = 0 to 50, r = 0 to 50, s = 0, and q+r is at least 1, q = 0 to 50, r = 0 to 50, s = 0, and q+r is at least 1, R is selected from monovalent organic groups having up to 22 carbon atoms and optionally one or more heteroatoms, and wherein the free valencies at the nitrogen atoms are bound to carbon atoms, R 2 is methyl; Y is a group of the formula: -K-S-K- and -A-E-A'-or-A'-E-A-, with S= wherein R 1 = C 1 -C 22 -alkyl, C 1 -C 22 -fluoralkyl or aryl, n = 300 to 500, K is a bivalent or trivalent straight chain, cyclic and/or branched C2-C40 hydrocarbon residue which is optionally interrupted by -O-, -NH-, trivalent N, -NR 1 -, -C -, -C -, and optionally substituted with -OH, wherein T is selected from a divalent organic group having up to 20 carbon atoms and one or more hetero atoms.