LPS-42458 Same fix as Currency Converter in portal