The electrical consumption mitigation provided by energy storage systems can be unreliable when a consumption peak lasts long enough to deplete the energy stored and the remainder of the peak is unmitigated. By implementing a waiting period between detecting the peak and discharging the energy storage in which characteristics of the peak are observed, a peak mitigation system can lengthen the effective discharge duration of the energy storage system and prevent unmitigated plateaus from appearing. For example, when a consumption plateau is detected, the system may discharge at a slower rate than when a spike is detected in order to prolong mitigation activities before the conclusion of the plateau. Thus otherwise-incurred demand-related utility charges can be reduced without having to increase the capacity of the mitigation system. In some cases, these processes are performed with respect to the bounds of demand-averaged time periods used to calculate demand charges.