diff --git a/MfciPkg/MfciDxe/MfciDxe.c b/MfciPkg/MfciDxe/MfciDxe.c
index cebd8d796a..b4a9d7323f 100644
--- a/MfciPkg/MfciDxe/MfciDxe.c
+++ b/MfciPkg/MfciDxe/MfciDxe.c
@@ -667,8 +667,7 @@ ValidateBlobWithXdrCertificates (
       break;
     }
 
-    PublicKeyDataCurrent = PublicKeyData + PublicKeyDataLength;
-    PublicKeyDataCurrent = (UINT8 *)ALIGN_POINTER (PublicKeyDataCurrent, sizeof (UINT32));
+    PublicKeyDataCurrent = PublicKeyData + ALIGN_VALUE (PublicKeyDataLength, sizeof (UINT32));
   }
 
   // above is inspired/borrowed from FmpDxe.c