A controller-implemented method includes reading, by a controller, a scrub unit containing a read unit and, in response to determining that the scrub unit is not marked as being scrubbed in a current scrub cycle, storing, by the controller, the scrub unit to a memory. The method also includes marking, by the controller, another scrub unit associated with the stored scrub unit as a scrub-pending scrub unit and reading, by the controller, the scrub-pending scrub unit in response to determining that a subsequent read matches predefined criteria. The method includes performing, by the controller, a scrub using the stored scrub unit and the scrub-pending scrub unit. A system includes a processor and logic integrated with the processor, executable by the processor, or integrated with and executable by the processor. The logic is configured to perform the foregoing method.