In 1924 the works were continued. After the extensive repair and restoration works of 1932–1934, conducted by AzCUOP together with the Moscow State Restoration Workshops for projects designed by architect Boris Zasypkin, the building of the former Shirvanshah palace was given to the Azerbaijan History Museum AzFAN. Since the clay floors were fragile, and the building of the palace was intended for the organization of a museum in it, during the repair and restoration work the floors were covered with parquet. Also during the works from the window openings were laid the stones laid in the 19th century, and they were returned to their original appearance. The original layout of the second floor was not restored, due to the fact that the premises were supposed to be a museum: where there are only two rooms, there were originally eight rooms. The plan of the first floor was completely restored.
