Fix another race in Notification Queue