Remove async DB call and handle null media content type