A hair conditioning composition comprising silicone polymer containing quaternary groups and a gel matrix. The composition of the present invention can provide improved conditioning benefits such as smooth feel and reduced friction to both damaged hair and non-damaged hair, while providing other benefits such as slippery and slick feel on wet hair.