Cruiserweight division. He was involved in a feud between Kane and The Great Khali, once again promoting Khali in March 2007. His first match against Kane involved him being dragged backstage by Kane's chain and hook leaving his back with multiple bruises. A few weeks later, Daivari had a rematch with Kane and was again defeated. Singles competition (2007) Daivari returned to SmackDown! a few months later, teaming up with Chavo Guerrero Jr. and Jamie Noble against Jimmy Wang Yang, Paul London and Brian Kendrick in a losing effort. On the June 15, 2007, episode of SmackDown!, Daivari competed in a fatal four-way number one contender match for the Cruiserweight Championship, which he lost to Yang and also involved Shannon Moore and Noble. 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 (Raws 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. On October 16, 2007, Daivari was released from his WWE contract. Sporadic appearances and producer role (2011, 2018-present) On May 3, 2011, Daivari made his WWE return by competing in a dark match before the SmackDown tapings, losing to Ted DiBiase. In 2018, Daivari made his second return to WWE during a segment at Greatest Royal Rumble in Saudi Arabia where he and his brother, Ariya Daivari, were driven out of the ring by four new Saudi recruits. He was later hired by WWE as a producer in January 2019, and was eventually released on April 15, 2020, as part of budget cuts stemming from the COVID-19 pandemic. He returned on June 11, 2021. Independent circuit (2007–2008) Daivari made his debut for Professional Championship Wrestling in Arlington, Texas, at PCW's Heroes 2 Legends event in November 2007. He wrestled J.T. Lamotta and "Jiggle-O" James Johnson in a triple threat match for the PCW Cruiserweight