MDL-41557 Events: Fixed event data snapshot to save valid data