After my previous post, I tried logging the Mac out of iCloud and logging back in again. Fingers crossed.