On April 11, 2017, Sin Cara was moved to the SmackDown brand as part of the Superstar Shake-up. On the October 17 episode of SmackDown Live, Sin Cara started a feud with the United States Champion Baron Corbin, but on November 6, Sin Cara revealed on Twitter that he suffered a legitimate leg injury during the European tour against Baron Corbin. However, the injury was not severe and he was cleared to compete shortly afterwards. On the November 14 episode of SmackDown Live, Sin Cara failed to win the United States Championship, after being defeated by Corbin. At WrestleMania 34 on April 8, 2018, Sin Cara competed in the André the Giant Memorial Battle Royal, but failed to win. On the May 29 episode of SmackDown Live, Sin Cara tried to reconnect with Andrade "Cien" Almas only to be blown off. At Extreme Rules on July 15, Sin Cara lost to Almas. On August 15, it was reported that Sin Cara underwent knee surgery. In March 2019, he was cleared to return to in-ring action. At Super ShowDown on June 7, 2019, Sin Cara competed in the 51-man battle royal, but failed to win. As part of the 2019 draft, Sin Cara was drafted to Raw and restarted his feud with Andrade, where he lost against him on the October 21 and 28 episodes of Raw. Sin Cara also allied with NXT wrestler Carolina to face Andrade and Andrade's manager Zelina Vega, but they were defeated by Andrade and Vega on the November 4 episode of Raw. After the match, Arriaga asked WWE for future plans and, while several WWE producers didn't answer him, Raw's Executive Director Paul Heyman told him the character of Sin Cara was "dead", which was one of the reasons to leave the company. On the November 11 episode of Raw, Sin Cara was defeated by Drew McIntyre, in what would be his final televised match in WWE. On that same show was aired, Arriaga requested his release from WWE, citing that while grateful about the opportunities that WWE gave him, he felt unappreciated and wanted to expand his career elsewhere. On December 8, WWE officially granted his release and Arriaga departed from the company. Return to Mexico (2019–present) On December 14, 2019, at Lucha Libre AAA Worldwide's annual Guerra de Titanes show, Arriaga made a surprise appearance after one of the matches. Arriaga, wearing the