A vapor-generating system includes a cartridge including a first vapor-forming substrate, the cartridge having an annular shape and at least one end configured to abut a flange and at least partially cover a device air inlet, and a vapor-generating device having an outer surface that defines the flange, the vapor-generating device being configured to be overlain by the cartridge such that the cartridge is coupled against the flange, the vapor-generating device including a liquid storage section containing a second vapor-forming substrate, the second vapor-forming substrate being a liquid substrate, and a power supply section, the liquid storage section being configured to removably attach to the power supply section such that at least one of the flange and the device air inlet are defined by outer surfaces of the liquid storage section and the power supply section.