[CLC-1726] Harden Canvas endpoints to not fail when there is no data