There is described a handheld aerosol-generating device which comprises an elongate tubular component having an axial length and which accommodates an electric power source. A mouthpiece portion having at least one air inlet and an outlet communicating with one another is detachably connected with the elongate tubular component. The electric power source is of an annular configuration extending at least about a major part of the axial length of the tubular component, and encloses an elongate receptacle which is open towards the mouthpiece portion, for accommodation of a cartridge comprising a supply of aerosol-forming substrate and an electrically operated vaporizer.