Fixup restore handling with custom renderEmpty