On the April 7, 2006, episode of "SmackDown!", Daivari made his return bringing in the debuting The 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 attacked 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, episode of "SmackDown!", in which Roddy Piper made fun of Khali, who supposedly couldn'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 straightened Piper's jacket disrespectfully, at which 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.