A cryopump includes a refrigerator with at least first and second stages. A radiation shield surrounds the second stage and is in thermal contact with the first stage. The radiation shield includes a drain hole to permit cryogenic fluid to traverse through the drain hole during regeneration. The cryopump also includes a primary pumping surface supporting adsorbent in thermal contact with the second stage. The second stage array assembly includes a primary condensing surface, protected surfaces having adsorbent, and non-primary condensing surfaces. A baffle is disposed over the drain hole. The baffle redirects gas from an annular space disposed between the radiation shield and the vacuum vessel that attempts to traverse through the drain hole to prevent the gas from condensing on a non-primary condensing surface. The baffle directs gas to condense on the primary condensing surface.