An extractor for extracting an aerosol-forming substrate from an aerosol-generating device is provided, the extractor including: a first component configured to connect to the aerosol-generating device, the first component including a base and one or more side walls extending from the base to define a cavity configured to receive an aerosol-forming substrate; and a second component configured to connect to the first component, the second component defining a cylindrical cavity or a circular aperture configured to receive a mouthpiece article for the aerosol-generating device. An aerosol-generating device comprising the extractor, and a system comprising the extractor, are also provided.