The present system and method in one embodiment limit a maximum instantaneous peritoneal volume to a comfortable level, while allowing the dialysis machine to advance to fill a prescribed volume whenever the drain ends after a minimum drain percentage has been attained. If a low drain condition occurs, the nominal fill volume is lowered and a therapy cycle is added, so that a prescribed total amount of fresh therapy fluid is used during therapy, maximizing therapeutic benefit. An allowable residual volume at the end of an incomplete drain is increased, thereby lowering the probability of a subsequent low drain condition.