diff --git a/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/CreateProfileModal.tsx b/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/CreateProfileModal.tsx
index 2e1705f17..3ad2290b2 100644
--- a/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/CreateProfileModal.tsx
+++ b/frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/CreateProfileModal.tsx
@@ -390,17 +390,23 @@ export const CreateProfileModal = ({ isOpen, onClose, profile, mode = "create" }
                   {...field}
                   onValueChange={(value) => {
                     if (watchedEnrollmentType === "est") {
+                      setValue("apiConfig", undefined);
                       setValue("estConfig", {
                         disableBootstrapCaValidation: false,
                         passphrase: ""
                       });
-                      setValue("apiConfig", undefined);
-                    } else {
+                      setValue("acmeConfig", undefined);
+                    } else if (watchedEnrollmentType === "api") {
                       setValue("apiConfig", {
                         autoRenew: false,
                         renewBeforeDays: 30
                       });
                       setValue("estConfig", undefined);
+                      setValue("acmeConfig", undefined);
+                    } else if (watchedEnrollmentType === "acme") {
+                      setValue("estConfig", undefined);
+                      setValue("apiConfig", undefined);
+                      setValue("acmeConfig", {});
                     }
                     onChange(value);
                   }}
@@ -438,12 +444,14 @@ export const CreateProfileModal = ({ isOpen, onClose, profile, mode = "create" }
                         disableBootstrapCaValidation: false,
                         passphrase: ""
                       });
+                      setValue("acmeConfig", undefined);
                     } else if (value === "api") {
-                      setValue("estConfig", undefined);
                       setValue("apiConfig", {
                         autoRenew: false,
                         renewBeforeDays: 30
                       });
+                      setValue("estConfig", undefined);
+                      setValue("acmeConfig", undefined);
                     } else if (value === "acme") {
                       setValue("apiConfig", undefined);
                       setValue("estConfig", undefined);