[IOT-2746][ES] Static analysis warning fix.