[CB-4090] Broken notification handling