This paper represents a modified version (called T-AMPD) of automatic multiscale-based peak detection (AMPD) algorithm, which was previously proposed by Scholkmann et al for peak detection of noisy periodic and quasi-periodic signals, in order to optimize the algorithm and reduce the computational cost while still maintaining the accuracy. By introducing a new parameter , the number of expected peaks, to the algorithm and some other adjustments, the T-AMPD outperforms the original algorithm in processing time. Experiments in some real-world signals show that the modified algorithm is greatly better than the original one in runtime performance. Specifically, our T-AMPD was compared to the newest version of AMPD which is available in an R programming package. As a result, our T-AMPD is 2 to 25 times faster than the original AMPD in computational time, while the accuracy remains unchanged.