An aerosol-generating device for generating an aerosol from an aerosol-forming substrate comprises a controller configured to control a usage session. The controller configured to control the usage session with reference to a first criteria or with reference to a second criteria different to the first criteria. The first criteria may be, for example, number of puffs taken during the usage session and the second criteria may be, for example, volume of aerosol generated during the usage session. The ability to select different criteria for control of a usage session allows a user to configure control of the device to their own preferences.