Pin-fins are considered as one of the best elements for heat transfer enhancement in heat exchangers. In this study, the topology of pin-fins (length, diameter, and shape) is optimized based on the entropy generation minimization (EGM) theory coupled with the constructal law (CL). Such pin-fins are employed in a heat exchanger in a sensible thermal energy storage (TES) system so as to enhance the rate of heat transfer. First, the EGM method is used to obtain the optimal length of pin-fins, and then the CL is applied to get the optimal diameter and shape of pin-fins. Reliable computational fluid dynamics (CFD) simulations of various constructal pin-fin models are performed, and detailed flow and heat transfer characteristics are presented. The results show that by using the proposed system with optimized pin-fin heat exchanger the stored thermal energy can be increased by 10.2%.