SONAR-5627 Fix infinite scrolling