 On January 9, 2018, Rivera signed with the Los Angeles Angels.Rivera was claimed off waivers by the Atlanta Braves on August 29, 2018.On February 8, 2019, he signed a minor league deal with the San Francisco Giants.