Problem Switching between RAW and JPG with Canon R5 Files

I have two cameras. Canon 80D and new R5. Both save files into JPG and RAW. With the 80D photos I can switch between the two file formats easily when editing. It just does it back and forth without any messages.

With the new R5 files when I choose "Switch to RAW" I get a popup that says "Switching RAW/JPG masters..." with a blue line as if it's doing something and almost done. But it gets stuck forever and doesn't do anything. I have to force quit out of Photos. So I cannot switch between JPG and RAW for R5 pics in Photos. I realize the R5 is a new camera so not sure if the problem is Apple or Canon.

Anyone have this issue? Thank you!