Cika wannan jumla: A ranar 29 ga Janairu, 2017, a
Royal Rumble, Kalisto ya halarci wasan farko na Royal Rumble, ya shiga a matsayin lamba uku kuma Braun Strowman ya fitar da shi. A ranar 10 ga Afrilu, 2017, an tura Kalisto zuwa alamar Raw a matsayin wani ɓangare na Superstar Shake-up. Braun Strowman ya kai masa hari a mako mai zuwa, wanda ya jefa shi cikin kwandon shara, ya kafa wasan kwandon shara a ranar 24 ga Afrilu na "Raw", wanda Kalisto ya ci nasara. Bayan wasan, Strowman ya sanya Kalisto a cikin kwandon shara sannan ya ci gaba da tura shi daga hanyar shiga, wanda ya haifar da Kalisto yana fama da labarin "raunin hip da na mahaifa". Bayan ya dawo, Kalisto ya shiga cikin rikici tare da Apollo Crews game da sa hannun Crews tare da Titus O'Neil's Titus Brand, wanda ya haifar da wasa a ranar 4 ga Yuni a Extreme Rules pre-show, inda Kalisto ya ci Crews.