Water heating by utilizing solar energy for domestic use is a well established technique. However, most systems consist of the solar collector and storage tank as separate units and require piping and extra thermal insulation for both. This work considers an integrated system, which is easy to manufacture or to modify the storage tank to operate as a solar collector as well as a storage tank. The system contains a thermal diode to prevent reverse circulation at night-time. A prototype is constructed and a mathematical model is developed to study the thermal performance of the integrated system. It is found that the thermal efficiency of the suggested system is comparable with conventional systems. Also, simulation indicated that the thermal diode significantly reduces heat losses at night-time.