APOLLO-3708 Updated listener to play nicely