On January 29, 2017, at Royal Rumble, Kalisto took part in his first Royal Rumble match, entering as number three and being eliminated by Braun Strowman. On April 10, 2017, Kalisto was moved to the Raw brand as part of the Superstar Shake-up. He was attacked the following week by Braun Strowman, who threw him inside a dumpster, setting up a dumpster match on the April 24 episode of "Raw", which Kalisto won. Following the match, Strowman put Kalisto in the dumpster and then proceeded to push it off the entrance ramp, resulting in Kalisto suffering storyline "hip and cervical trauma". After returning, Kalisto engaged in a feud with Apollo Crews over Crews' involvement with Titus O'Neil's Titus Brand, which resulted in a match on June 4 at the Extreme Rules pre-show, where Kalisto defeated Crews.