LPS-43353 Avoiding unnecessary remote call