diff --git a/ui/app/models/pki/tidy.js b/ui/app/models/pki/tidy.js
index c7cd17f0f5..ee4f335a1f 100644
--- a/ui/app/models/pki/tidy.js
+++ b/ui/app/models/pki/tidy.js
@@ -97,6 +97,11 @@ export default class PkiTidyModel extends Model {
   })
   tidyCrossClusterRevokedCerts; // enterprise only
 
+  @attr('boolean', {
+    label: 'Tidy CMPv2 nonce store',
+  })
+  tidyCmpv2NonceStore; // enterprise only
+
   @attr('boolean', {
     subText: 'Automatically remove expired issuers after the issuer safety buffer duration has elapsed.',
   })
@@ -155,6 +160,7 @@ export default class PkiTidyModel extends Model {
         'Cross-cluster operations': [
           'tidyRevocationQueue',
           'tidyCrossClusterRevokedCerts',
+          'tidyCmpv2NonceStore',
           'revocationQueueSafetyBuffer',
         ],
       });
diff --git a/ui/tests/helpers/openapi/expected-secret-attrs.js b/ui/tests/helpers/openapi/expected-secret-attrs.js
index 35e664877d..cd0d3cac83 100644
--- a/ui/tests/helpers/openapi/expected-secret-attrs.js
+++ b/ui/tests/helpers/openapi/expected-secret-attrs.js
@@ -1457,6 +1457,12 @@ const pki = {
       fieldGroup: 'default',
       type: 'boolean',
     },
+    tidyCmpv2NonceStore: {
+      editType: 'boolean',
+      fieldGroup: 'default',
+      helpText: 'Set to true to enable tidying up the CMPv2 nonce store',
+      type: 'boolean',
+    },
     tidyCrossClusterRevokedCerts: {
       editType: 'boolean',
       helpText:
diff --git a/ui/tests/integration/components/pki/pki-tidy-form-test.js b/ui/tests/integration/components/pki/pki-tidy-form-test.js
index e2d801fee3..d1d758cc28 100644
--- a/ui/tests/integration/components/pki/pki-tidy-form-test.js
+++ b/ui/tests/integration/components/pki/pki-tidy-form-test.js
@@ -32,7 +32,7 @@ module('Integration | Component | pki tidy form', function (hooks) {
   });
 
   test('it hides or shows fields depending on auto-tidy toggle', async function (assert) {
-    assert.expect(39);
+    assert.expect(41);
     const sectionHeaders = [
       'Universal operations',
       'ACME operations',
@@ -82,7 +82,7 @@ module('Integration | Component | pki tidy form', function (hooks) {
   });
 
   test('it renders all attribute fields, including enterprise', async function (assert) {
-    assert.expect(27);
+    assert.expect(29);
     this.autoTidy.enabled = true;
     const skipFields = ['enabled', 'tidyAcme', 'intervalDuration']; // combined with duration ttl or asserted separately
     await render(
@@ -190,6 +190,7 @@ module('Integration | Component | pki tidy form', function (hooks) {
           tidy_acme: true,
           tidy_cert_metadata: true,
           tidy_cert_store: true,
+          tidy_cmpv2_nonce_store: true,
           tidy_cross_cluster_revoked_certs: true,
           tidy_expired_issuers: true,
           tidy_move_legacy_ca_bundle: true,