In this study, beeswax as a new energy storage material and its composite with expanded graphite were prepared and characterized for their surface and thermal properties. Surface characterization showed no chemical interaction between beeswax and expanded graphite. The thermal conductivity of the composite was improved with 117% enhancement. The thermal performance of beeswax and its composite as a heat storage material was studied in a rectangular shell-and-tube thermal storage unit. The melting point of the composite remained almost same as that of beeswax; however, the melting time was reduced considerably, from 540 to 360min with inlet water at 80 degrees C and a 2-lpm flow rate.