SONAR-3557 Fix render issue