[BUG #8110] Make sure the original event is always present