An aerosol-generating system includes an electric heater, a battery and control circuitry. The electric heater is configured to vaporize an aerosol-forming substance. The battery is configured to power the electric heater. The control circuitry is configured to: prevent charging of the battery in response to detecting that the electric heater is in an operation state; or prevent operation of the electric heater in response to detecting that the battery is in a charging state.