The present invention relates to an aerosol-generating system, comprising a pump having an inlet and an outlet, the inlet being connectable to a liquid storage portion. The system also comprises a fluid channel fluidly connected to the pump and a fluid sensor. The fluid sensor is configured to determine a presence of liquid aerosol-forming substrate in the fluid channel by measuring an electrical property of the fluid comprised in the fluid channel.