After Abdul Samad al-Isfahani died in 1299, his successor Shams al-Din Natanzi proposed the construction of a shrine and khanqah over his grave.

[1] The vizier of Ilkhanid ruler Öljaitü, Zayn al-Din Mastari, supported his proposition and ordered construction to be carried out.

[3] A restoration in the 1970s revealed that the base of the tomb of the saint predated the mosque, and was originally a free-standing pavilion from the Buyid era, dating to the late tenth century.

An arched portal leads through a short flight of stairs onto a corridor, which ends in the southwestern corner of the courtyard of the mosque.

Two bays at the rear of the south iwan flank the qibla wall, and lead to the shrine of Abdul Samad al-Isfahani, which is topped by a conical dome on an octagonal base.