Preserve the notify_endpoint