ERP-1184 Possible fix for events not loading, 2nd try