After the Board of Guardians was abolished in 1930, the Queens Road Homes (formerly Croydon Workhouse) were taken over by the County Borough of Croydon from 1 April 1930, but continued to perform the same function (with a growing emphasis on the care of the elderly). In 1939, on the outbreak of war, the Homes were reclassified as a Class 2 Hospital under the Emergency Hospital Scheme; and as such received chronic sick cases. The buildings were partly destroyed by bombing in April 1941. The hospital was taken over by the National Health Service (SW Metropolitan Regional Hospital Board) in 1948, when it was renamed Queens Hospital, and became a geriatric hospital. It closed in 1987.