The Scottish DJ teased that there would be a special surprise during his set when he Tweeted his fans to say: "There might be an exciting surprise during my Coachella set later !" Admittedly, it was not much of a surprise though with Rihanna Tweeted images of herself at the festival all day.
Regardless, Rihanna joined Calvin for a run through of their join smash 'We Found Love' later in the day. Katy Perry was spotted cheering the pair on from the front of the crowd.
Meanwhile, Rihanna was also spotted watching Snoop Dogg and Dr Dre's headline show - which featured a lifelike hologram performance from the late Tupac Shakur.