Daivari returned to "SmackDown!" on February 9, 2007, defeating then Cruiserweight Champion Gregory Helms in a non-title match. He wrestled in a Cruiserweight Open for the WWE Cruiserweight Championship at No Way Out, won by Chavo Guerrero. He began wrestling in the 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.