Port servicing fix (#15802)