Daivari was drafted back to "Raw" in the supplemental draft on June 17, 2007. He re-debuted on the June 18, 2007, episode of "Raw", losing to Jeff Hardy. On the July 30, 2007 episode of "Raw", Daivari was defeated by Cody Rhodes who had to win his match or else being fired from WWE. Daivari's losing streak continued when he failed to win the position of General Manager of "Raw" by been eliminated early in the battle royal the week after Rhodes defeated him. Daivari then started to get on a roll on "Heat" ("Raw"'s sister show) being victorious against Super Crazy and "Hacksaw" Jim Duggan. His return to "Raw" on September 17, 2007 saw him lose to Duggan in a flag match.