The aerosol-generating device comprises a device housing (2), a mouthpiece (3) associated to the device housing, a receiving chamber (4) configured to receive from external to the device at least a portion of a sheet of aerosol-forming substrate in a non-rolled form and configured to accommodate a cylindrically shaped of aerosol-forming substrate and a holder (6) for holding the sheet of aerosol-forming substrate. The device further comprises a rolling device (7) for receiving a flat or non-rolled sheet of aerosol-forming substrate and for rolling the sheet of aerosol-forming substrate around the holder from the non-rolled form into a cylindrically shaped aerosol-forming substrate.