#4564 missing notification id fix