A system and method for automatically adjusting a Continuous Cycling Peritoneal Dialysis (“CCPD”) therapy to minimize the potential for excess intra-peritoneal volume. The adjustments are made at the end of the drain, just prior to the next fill. The adjustments short the next fill, if necessary, to limit the intra-peritoneal volume, add a cycle, if necessary, to use all of the available dialysis solution and will average the remaining dwell time to maximize the therapeutic benefit of the therapy in the allotted time. In another embodiment, a tidal therapy using trended patient UF data is provided.