We improved the thermal dissociation cavity attenuated phase shift spectroscopy (TD-CAPS) instrument to measure atmospheric total peroxy nitrates (PNs) and organic nitrates (ONs) continuously under the condition of high NOx. In TD-CAPS, PNs and ONs are dissociated in heated quartz tubes to form NO2, and the NO2 concentration is measured by cavity attenuated phase shift spectroscopy (CAPS). The original TD-CAPS system overestimates PN and ON concentrations in the presence of high NO concentrations. Our laboratory experiments and numerical simulations showed that the main cause of the overestimation was NO oxidation to NO2 by peroxy radicals generated in the heated quartz tubes. In the improved system, NO was converted to NO2 by adding excess O3 after the quartz tubes so that CAPS detected NOx (NO and NO2) instead of NO2. The uncertainty of the improved system was less than 20% with ∼15 parts per billion by volume (ppbv) NO and ∼80 ppbv NO2. The estimated detection limit (3σ) was 0.018 ppbv with an integration time of 2 min in the presence of 64 ppbv NO2. The improved system was tested for measurement of PNs and ONs in an urban area, and the results indicated that interference from NO was successfully suppressed.