Last week, they experienced a dramatic upheaval that involved police intervention and a domestic incident report.

However, Diddy, 46, and his on-again, off-again girlfriend Cassie were clearly in high spirits at the singer-actress’ 30th birthday celebration on Friday night.

Khloe Kardashian, the special guest, shared moments of the couple’s affectionate behavior on Snapchat as they joined friends in singing “Happy Birthday” to the star of Honey 3.

Cassie, whose full name is Casandra Elizabeth Ventura, certainly caught Diddy’s eye, dressed in a stylish ensemble featuring a white bikini top beneath an embellished white jacket.

Her hair, adorned with a wreath of white roses and green leaves, cascaded in beautiful curls over her shoulders.

Diddy beamed with pride as he presented the birthday cake, surrounded by friends who joined in the celebration.

According to E! News, the couple had a brief separation but are now “back together.” A source revealed, “Diddy won’t ever let Cassie get away. He loves her so much.”

Earlier in the day, Diddy shared a sultry photo of Cassie in her bikini, captioning it, “HAPPY BIRTHDAY BABY! @cassie I LOVE YOU ALWAYS. GOD BLESS YOU.”

Meanwhile, Khloe, 32, added to the festivities, playfully posing for the camera.