Will Smith slapping Chris Rock in the face during the 94th Academy Awards on Sunday night (March 27) — retribution for a G.I. Joke 2 joke about his wife Jada Pinkett’s alopecia — will go down in history as one of the wildest moments in live television.

But according to Diddy, the bad blood between the Hollywood legend and veteran comedian was anything but lasting. The former Bad Boy boss reportedly spoke to both Will Smith and Chris Rock following the widely-viewed dustup and insisted the pair have already mended fences.

“That’s not a problem,” he told Page Six. “That’s over. I can confirm that. It’s all love. They’re brothers.”

Diddy actually took to the Oscars stage moments after the slap to present a special tribute to The Godfather for its 50th anniversary, where he offered to play peacemaker during a slightly improvised speech.

“I did not know that this year was going to be the most exciting Oscars ever,” he joked. “Okay, Will and Chris, we’re going to solve that like family at the Gold party. But right now, we’re moving on with love. Everybody make some noise!”

Speaking with Vanity Fair following the Oscars, Puff explained he wanted to “bring love into the room” with his speech.

“I was just as shocked as everybody else, but I just went on how I was feeling,” he said. “I thought it was very important to bring love into the room. I think we know both of those guys’ characters and, you know, sometimes shit happens.”

Diddy also took to his Instagram Stories following the awards ceremony to share his more unfiltered reaction to the drama that unfolded on stage.

“I know shit is crazy. You know, shit happens sometimes,” he said while sat in the back of a car. “My n-gga Chris Rock got a chin, though. I know ain’t nobody… even… not thinking what I’m thinking. He got a chin!”

Will Smith swiftly apologized for slapping Chris Rock (albeit without mentioning the comedian by name) while accepting the award for Best Actor for his portrayal of Serena and Venus Williams’ father, Richard, in King Richard.

“I want to apologize to the Academy. I want to apologize to all my fellow nominees,” he said, before adding, “Art imitates life — I look like the crazy father, just like they said about Richard Williams. But love will make you do crazy things.”

50 Cent, Snoop Dogg, The Game + More React To Will Smith's Chris Rock Oscar Punch

The LAPD confirmed Sunday night that Chris Rock declined to press charges against Will Smith. “LAPD investigative entities are aware of an incident between two individuals during the Academy Awards program,” their statement read.

“The individual involved has declined to file a police report. If the involved party desires a police report at a later date, LAPD will be available to complete an investigative report.”

The Fresh Prince of Bel-Air star certainly seemed to be in good spirits after the Academy Awards altercation as he was filmed dancing and rapping along to his 1998 hit “Gettin’ Jiggy Wit It” while holding his Oscar at Vanity Fair‘s Oscars afterparty in Beverly Hills.