Although the building was classified by the Instituto Português do Património Arquitectónico (IPPAR) as a National Monument in 1910, by 1912, the building was in a state of degradation, without appropriate roof and used by squatters and the poor as shelter. Restoration of the building was completed in 1936 by the "Direcção-Geral dos Edifícios e Monumentos Nacionais" (), or DGEMN (which evolved to become the Instituto de Gestão do Património Arquitectónico e Arqueológico (IGESPAR)). Similar restorations were undertaken in 1959 by the Serviços dos Monumentos Nacionais (), before being taken over on 1 June 1992 by the IPPAR by decree 106F/92.