This past weekend, Tip was playing the role of peacemaker again, this time calming down a very angry Diddy.

MTV's RapFix reports that during an event at club Compound, which Diddy MCed, the rap mogul became very angry, calling out a person inside the club for promoting a beverage other than Ciroc vodka, for which he is a stakeholder.

Things got heated as Diddy snatched the drink from the partygoer, after which the man approached the entrepreneur.

However, T.I. took the microphone from Diddy, and suggested that everyone relax, which diffused the situation.

Check out the video below: