Icodextrin-based solutions and methods of making same that can be used during medical therapy, such as dialysis therapy are provided. The icodextrin-based solution at least includes a first solution containing icodextrin at a pH ranging from about 1.5 to about 5.0 and a buffer solution at a pH ranging from about 7.0 to about 12.0 that are so constructed and arranged allowing the icodextrin-based solution to be mixed prior to infusion into a patient. The icodextrin-based solutions of the present invention can be made at physiologic pH and with minimal glucose degradation products.