This paper presents an original study on the design and optimization of baffled fluid distributor for the realization of optimal fluid flow distribution in a tubular solar receiver. The basic idea is to install a perforated baffle in the inlet fluid distributor and to optimize the configuration of orifices on the baffle so as to approach the target flow distribution among downstream parallel tubes. A pressurized-air solar receiver comprising of 45 parallel tubes is used for study, with copper or Inconel 600 used as the filling material. Results show that the final fluid flow distributions realized by the geometrically optimized baffles are in good agreement with the target curves. The peak temperature of the receiver wall can be minimized accordingly with moderate increase in total pressure drop of the receiver system. It is shown that the insertion of a geometrically optimized baffle is generally a practical solution with various features: capable of realizing non-uniform target distribution; small pressure drop increase; compact geometry; flexible and adaptive; easy fabrication with a reasonable cost, etc. (C) 2016 Elsevier Ltd. All rights reserved.