@vincent For my original Mac (2011 MBP) I switched off Photos in iCloud specifically and that helped.