Last year, Diddy sued spirits giant Diageo.
According to Puff, they discriminated against him and his Deleon tequila band due to his race.
The suit alleges Diageo stopped promoting and limited the distribution of DeLeon after they purchased George Clooney's Casamigos tequila for a billion dollars in 2017.
Diddy alleges that Diageo execs labeled DeLeon a "Black" brand that should only be targetted to "urban" audiences. (The suit claims they've done the same with his Chiroq vodka brand.)
This week, Puff and Diageo settled.
"Sean Combs and Diageo have now agreed to resolve all disputes between them. Mr. Combs has withdrawn all of his allegations about Diageo and will voluntarily dismiss his lawsuits against Diageo with prejudice," read a statement shared by both parties.
If there were any financial terms to the settlement, they weren't disclosed.
After Puff filed the suit, he and Diageo ended their business relationship. Diageo now solely owns DeLeon and Chiroq.