Sean “Diddy” Combs has added Atlanta attorney Brian Steel to his legal team, a month before his trial begins.

Steel, who previously represented Atlanta rapper Young Thug in the blockbuster YSL trial, filed a motion Tuesday to appear as counsel for the embattled music mogul and submitted his credentials to practice law in the U.S. Southern District Court of New York. Combs was indicted last year on charges of sex trafficking, racketeering and transportation to engage in prostitution. Through his lawyers, Combs has denied any wrongdoing.

Combs has been held at a Brooklyn detention center since September.

The latest development in the case comes a month after one of Combs’ lawyers, Anthony Ricco, withdrew from his defense team. With the addition of Steel, Combs’ legal counsel includes Marc Agnifilo and Teny Geragos. The latter is the daughter of Mark Geragos, a criminal defense attorney whose clients have included Scott Peterson, Winona Ryder, Michael Jackson and Chris Brown.

Steel, who has been a criminal defense attorney for over three decades, counts Young Thug, whose real name is Jeffery Williams, among his most notable clients. Last fall, the artist took a plea deal and was released from Fulton County Jail in the YSL gang trial. During the proceedings, Steel was held in contempt by Judge Ural Glanville after refusing to disclose how he heard about conversations between Glanville, the prosecution and a key witness. Steel’s contempt charge was dropped. Glanville was replaced by Judge Paige Reese Whitaker.

The case, which lasted nearly two years, was the longest trial in Georgia’s history.

Young Thug is slated to headline two festivals this summer. Earlier this year, rapper Drake — a vocal supporter of Young Thug — named a song after Steel on his joint album with PartyNextDoor.

Jury selection in Combs’ case is set to begin May 5. Opening statements are scheduled for May 12.

About the Author