WWE: Daivari ,Part 2

Both Daivari and Hassan were later drafted to SmackDown! on June 23, 2005 as part of a package deal. On the July 7, 2005 episode of SmackDown!, GM Theodore Long put Daivari in a match that night against The Undertaker, and Muhammad Hassan in a match against The Undertaker at the Great American Bash. Daivari was squashed easily in that match, after which Hassan began to pray on the ramp, summoning five masked men to the ring. The masked men beat and strangled the Undertaker into submission, and Hassan put him in the Camel Clutch. Afterward, the masked men carried Daivari off like a martyr. The controversial imagery aired unedited in America and Canada despite the terrorist attacks in London earlier that day, but was removed from the Australian and UK broadcasts. (It should be noted that SmackDown! is taped on a Tuesday and, at the time, aired on Thursday, so the skit was taped 2 days before the attack occurred.)

In late-July, UPN requested WWE to keep Muhammad Hassan off of their network. WWE complied, effectively removing him from SmackDown! At the The Great American Bash 2005, after Hassan lost in a match with The Undertaker, Hassan was given the Last Ride through an open stage ramp onto a concrete floor where it was reported that he sustained serious injuries and had to be rushed to a nearby medical facility; this was an angle aimed to "kill off" the character.

Although Hassan (Mark Copani) would eventually retire from professional wrestling, Daivari reported to WWE's Deep South territory for training and repackaging. He returned from Deep South and, after working in Minneapolis, made his Wrestling Debut: in September 2005 on OVW TV returning as his "Sheik" Daivari persona.

On November 7, 2005, Daivari returned to RAW, acting as Kurt Angle's anointed special guest referee in the tag team match between Shawn Michaels and John Cena vs. Angle and Chris Masters. During the match, Daivari favored Angle and Masters, who won the match via disqualification when Michaels was caught with a chair Angle brought in.

On November 21, 2005, Kurt Angle announced that Daivari will be the referee for all his future matches, including his match vs. WWE Champion John Cena for the title at the 2005 Survivor Series. Mr. McMahon rescinded that at the kangaroo court trial of Eric Bischoff on RAW on December 5, 2005. Daivari remained aligned with Kurt Angle as his manager.

On January 10, 2006, at a taping of WWE Friday Night SmackDown!, Angle and Daivari jumped to SmackDown!, where Angle won the World Heavyweight Championship the very same night. Angle later revealed that his contract on RAW had expired, which allowed them to switch brands. However, Angle would already be signed to face Shawn Michaels on RAW. This non-title match went ahead, but Daivari would accidentally cost Kurt Angle the match against Michaels. Afterwards, Daivari and Angle argued, but when Daivari slapped Angle, he Angle Slammed Daivari over the ropes and down to the floor on the outside of the ring. During the break on WWE.com Unlimited, an enraged Angle made it known that Daivari's services were no longer needed, and that "he sucks".