A short time later, Daivari faced his former client in a match. During the match, Mark Henry, the number one contender for Angle's title, attacked Angle. After the match, Daivari officially announced that he was now managing Henry and continued to manage Henry during his feud with The Undertaker. However, Daivari would disappear off television in the weeks leading up to WrestleMania 22 when, at WWE's Saturday Night Main Event, Daivari suffered a chokeslam and Tombstone Piledriver at the hands of The Undertaker onto the lid of a casket.
On the April 7, 2006 edition of SmackDown!, Daivari would make his return bringing in the Wrestling Debut: ing Great Khali to attack The Undertaker during his match with Mark Henry. The next week, Daivari officially presented him to the crowd, hyping him as an unstoppable monster. Over the following weeks, Daivari would accompany Khali to the ring as he destroyed various Smackdown! superstars. This would all lead up to a match with The Undertaker at Judgment Day on May 21, 2006, which Khali would end up winning. Daivari and Khali appeared as guests on Piper's Pit on the June 2, 2006 edition of SmackDown!, in which Piper made fun of Khali, who supposedly can't speak English. Eventually Piper stood on the bottom rope, attempting to match height with Khali, he managed to say: If this was twenty years ago, before Khali grabbed him by the throat. Daivari made Khali put Piper down and straitened Piper's jacket disrespectfully, Piper slapped Daivari, but was then given a chop by Khali. The Undertaker was the original guest on the Pit, but he declined the invitation a few days before.
Daivari continued to accompany The Great Khali to the ring when Khali wrestled or attacked other wrestlers, but when The Great Khali became inactive due to injury, Daivari was taken off the road as well.
Daivari and The Great Khali were moved to the ECW brand officially when they made their ECW Wrestling Debut: s on the October 31, 2006 edition of ECW on Sci-Fi. Daivari beat "The Reject" Shannon Moore in a very quick match. Daivari's original theme music was used as well as his Farsi rants on the microphone. Afterwards, Moore was manhandled by The Great Khali.
Daivari would continue his ECW winning streak over the next several weeks with The Great Khali usually following up the contest with a Double-handed Choke Bomb on Daivari's opponent. At December to Dismember, Daivari got a victory over Tommy Dreamer following a schoolboy rollup. Dreamer then chased Daivari all the way to the back then, The Great Khali appeared and caught Dreamer, planting him on the steel ramp with a Chokebomb. On January 8, 2007, The Great Khali Wrestling Debut: ed on RAW, without Daivari. The following night, however, Daivari accompanied Khali to the ring for his match with Dreamer on ECW.
Daivari returned to SmackDown! on February 9, 2007, defeating Crusierweight Champion Gregory Helms in a non-title match. As of now he is only wrestling as a crusierweight.
Had his first pro match at age 15.
Started his career in the Midwest with All-Star Championship Wrestling.
His younger brother, Arya Daivari, has wrestled for NWA Wisconsin (formerly All-Star Championship Wrestling, as well as other independent wrestling promotions. As a tribute to his brother, Arya performs "The Magic Carpet Ride".
Grew up admiring Mick Foley and Bret Hart.
Appeared on the Jenny Jones show with his brother.
Appeared on WCW Monday Nitro on October 18, 1998 as a fan being interviewed by Mike Tenay.
Appeared on the October 5, 2003 edition of WWE Heat as "Sheik" Shawn Daivari, losing his match against Tommy Dreamer.
He made four appearances for Ring of Honor, and lost each match.
Every wrestler he has managed in WWE, has feuded with Undertaker at some point (Kurt Angle wasn't being managed during his feud however)
At one point, was scheduled to win the NWA Midwest X-Division Championship, and has promo photos circulating with him holding the belt. However, he never did win that title.