Marseille have reached an agreement to put an end to an unusual ticketing system that saw supporters' associations partially control the sale of season tickets.
The existing scheme, introduced by then-club president Bernard Tapie in 1990, had been credited with ensuring bigger crowds and a better atmosphere at the Stade Velodrome.
But concerns about a lack of control over who got their hands on tickets were heightened after trouble in the stands during Marseille's home game with Lyon last month saw play suspended for over 20 minutes.
As a provisional punishment, the club were forced to close the two stands behind each goal for the following home match against Angers.
Marseille also reintroduced protective netting to prevent a repeat of objects such as glass bottles being thrown on to the pitch and promised to discuss the ticketing system along with the supporters' associations concerned.
On Tuesday evening the club announced that they had come to an agreement to retake full control of ticket sales at the Stade Velodrome, which is one of 10 venues that will be used for next summer's European Championship in France.
A club statement read: "The supporters' groups of Olympique de Marseille have understood the arguments of the club and have taken account of the new stakes linked both to the footballing environment in general and to the success of the organisation of Euro 2016 in particular.
"The supporters' groups of Olympique de Marseille are more than ever attached to the values of the club and have always had as their only aim to make the Stade Velodrome a unique place in Europe in terms of welcome, celebration, enthusiasm, fervour and passion."
The current system sees Marseille sell season tickets to nine supporters' associations at a reduced rate.
These groups are tasked with selling on 28,000 tickets for the two stands behind each goal, a scheme that was credited with helping to create well-organised fan displays and singing during games.