LPS-46924 Simple Fix based on 62x commit for LPS-29025