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 6021aa39..5fccb328 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,6 +473,7 @@ public class PolicyPageController extends PageController<NoPageParams> {
             // set the policy option and create success message
             if (firmwareValidationOptionEnabled) {
                 policy.setFirmwareValidationEnabled(true);
+                policy.setIgnoreGptEnabled(true);
                 successMessage = "Firmware validation enabled";
             } else {
                 policy.setFirmwareValidationEnabled(false);
diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/PCRPolicy.java b/HIRS_Utils/src/main/java/hirs/data/persist/PCRPolicy.java
index 8676e94d..15bbf55e 100644
--- a/HIRS_Utils/src/main/java/hirs/data/persist/PCRPolicy.java
+++ b/HIRS_Utils/src/main/java/hirs/data/persist/PCRPolicy.java
@@ -39,7 +39,7 @@ public final class PCRPolicy extends Policy {
     @Column(nullable = false)
     private boolean linuxOs = false;
     @Column(nullable = false)
-    private boolean enableIgnoreGpt = false;
+    private boolean enableIgnoreGpt = true;
 
     private String[] baselinePcrs;