Bug fix duplicate notifications on null event