There is provided an aerosol-generating system comprising a heater comprising at least one heating element； and a capillary body, wherein the capillary body is wound around the heating element. The heating element and capillary body may be intertwined with one another. An aerosol-generating system in accordance with the invention has the advantage that the manufacturing process can be a fast and robust process. The heater can be formed with high precision and consistency. Furthermore, the heater and wick assembly is mechanically robust, allowing manual or automatic handling without affecting its dimensions. This allows for a consistent quality of production.
