LPS-44739 Update the listener to avoid random errors in CI