In 1952, there was an inventory of the images in the Church: at the time there existed 40 figures in wood and stone, located in various niches and altares in the sub-choir, nave, presbytery and dependent annexes. Considering the condition of the structure, it was determined that the organ, should be removed from the site and installed in the Church of Freixo de Espada-à-Cinta. But, still, water infiltration and humidity continued to degrade the pavement and stonework of the presbytery. In 1954, the tiles were repaired, which included the consolidation and painting of the "Chapel of Senhor dos Passos", repair of the walls, ceilings and access corridor towards the "Rua dos Bacalhoeiros". Similar repairs were completed in 1955, including the painting of the doors, re-plastering the interior and exterior surfaces, and new wood floors in the sacristy. The roof was repaired between 1965–67. Yet, in 1959, the Prior denounced the state of degradation in the sacristy, the access corridor towards the "Rua dos Bacalhoeiros" and the floor in the presbytery. The DGEMN, then, substituted the wood floor in the presbytery for stone; resurfaced the walls of the corridor access and sacristy's vestibule; oil painted the doors, panels and ceilings; cleaned the arcade; and painted the walls with water-based paints and an insulator.