APOLLO-3708 Updated Listener logic