LPS-39494 Use the correct listener