Provided is a method for correcting untrusted data and avoiding logical device swapping for at least one logical subsystem of at least one computer system. A processor may monitor a primary storage for one or more errors that indicate untrusted data on the primary storage. An error indicating that a data set on the primary storage is an untrusted data set may be identified. In response to the error being identified, a corresponding uncompromised version of the data set may be read from a secondary storage. The corresponding uncompromised version of the data set may be written over the untrusted data set on the primary storage.