LPS-44503 Move the listener registration to the right place