Fixes Core Data Deadlock

Fixes #2633

/cc @astralbodies + @sendhil  (Thanks in advance!)