There is provided an aerosol-generating system (10) comprising a cartridge (16), a vaporiser section (14) and a power supply section (12). The cartridge (16) comprises a cartridge housing (40) defining a cartridge air inlet (42) and a cartridge air outlet (44), the cartridge air inlet (42) extending through a wall portion (45) of the cartridge housing (40). The cartridge (16) also comprises a solid aerosol-forming substrate (46) positioned within the cartridge housing (40). The vaporiser section (14) comprises a vaporiser housing (18) defining a vaporiser air inlet (27) and a vaporiser air outlet (30), the vaporiser air outlet (30) extending through a wall portion (31 ) of the vaporiser housing (18). The vaporiser housing (18) is configured to receive at least a portion of the cartridge (16). The vaporiser section (14) also comprises an electric heater (38) and a liquid aerosol-forming substrate (32) each positioned within the vaporiser housing (18). The cartridge (16) and the vaporiser section (14) are configured so that the cartridge housing wall portion (45) abuts the vaporiser housing wall portion (31 ) when the vaporiser section (14) receives the cartridge (16). A rotational orientation of the cartridge (16) with respect to the vaporiser section (14) is variable, the amount of overlap between the cartridge air inlet (42) and the vaporiser air outlet (30) being variable between different rotational orientations. The power supply section (12) comprises a power supply (26) for supplying electrical power to the electric heater (38).
