Only set an enddate if one is available