Embodiments of a hair conditioning composition include a silicone polymer comprising one or more quaternary groups at least one silicone block comprising greater than 200 siloxane units at least one polyalkylene oxide structural unit and at least one terminal ester group. The silicone polymer has a viscosity of up to 100 000 mPa.s. The hair conditioning composition also includes a polymeric thickener.