Set tenant_id to avoid HTTP 509 error