diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java
index f6f3e43c..503df0f8 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/PolicyPageController.java
@@ -473,13 +473,14 @@ public class PolicyPageController extends PageController<NoPageParams> {
 
                 if (generateCertificateEnabled) {
                     threshold = ppModel.getThresholdValue();
-                    if (threshold == null) {
-                        threshold = SupplyChainPolicy.YEAR;
-                    }
                 } else {
                     threshold = ppModel.getReissueThreshold();
                 }
 
+                if (threshold == null || threshold.isEmpty()) {
+                    threshold = SupplyChainPolicy.YEAR;
+                }
+
                 policy.setReissueThreshold(threshold);
             } else {
                 generateCertificateEnabled = false;
@@ -542,13 +543,14 @@ public class PolicyPageController extends PageController<NoPageParams> {
 
                 if (generateDevIdCertificateEnabled) {
                     threshold = ppModel.getDevIdThresholdValue();
-                    if (threshold == null) {
-                        threshold = SupplyChainPolicy.YEAR;
-                    }
                 } else {
                     threshold = ppModel.getDevIdReissueThreshold();
                 }
 
+                if (threshold == null || threshold.isEmpty()) {
+                    threshold = SupplyChainPolicy.YEAR;
+                }
+
                 policy.setDevIdReissueThreshold(threshold);
             } else {
                 generateDevIdCertificateEnabled = false;