The present invention relates to a rod-shaped aerosol-generating article for use with an electrically heated aerosol-generating device. The article comprises a substrate core and a filler sleeve surrounding the substrate core. The substrate core comprises an aerosol-forming substrate and has a non-circular outer cross-section. The invention further relates to electrically heated aerosol-generating device and an aerosol-generating system for use with an aerosol-generating article.