diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx
index 23138202e..8fc59e013 100644
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx
@@ -53,12 +53,7 @@ const exportFormSchema = z
   .refine(
     (data) => {
       if (data.format === "pkcs12") {
-        return (
-          data.pkcs12Password &&
-          data.pkcs12Password.length >= 6 &&
-          data.pkcs12Alias &&
-          data.pkcs12Alias.trim() !== ""
-        );
+        return data.pkcs12Password && data.pkcs12Alias && data.pkcs12Alias.trim() !== "";
       }
       return true;
     },
@@ -67,6 +62,18 @@ const exportFormSchema = z
       path: ["pkcs12Password"]
     }
   )
+  .refine(
+    (data) => {
+      if (data.format === "pkcs12") {
+        return data.pkcs12Password && data.pkcs12Password.length >= 6;
+      }
+      return true;
+    },
+    {
+      message: "PKCS12 password must be 6 characters or longer",
+      path: ["pkcs12Password"]
+    }
+  )
   .refine(
     (data) => {
       if (data.format === "pkcs12" && data.pkcs12Password) {