Mediation is one of the most effective forms of dispute resolution, classified as an Alternative Dispute Resolution method and referred to as the “queen of ADR.” The process of adopting mediation into the Polish legal system began on July 26, 1991, when the Act of May 23, 1991, on the Resolution of Collective Disputes entered into force, and ended on June 1, 2017, when an amendment to the Act of June 14, 1960, the Code of Administrative Procedure, entered into force, introducing, among other things, a new Chapter 5a entitled “Mediation.” The subject of this article is to review legislative changes concerning mediation in civil and administrative proceedings in the years 2020-2025 and to assess whether these changes meet the fundamental objectives of mediation, which are to pursue the idea of restorative justice and the effectiveness of mediation as a form of out-of-court dispute resolution. The analyses carried out will allow for the drawing of general conclusions and de lege ferenda conclusions.