diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c
index d8cc9ba0e8..fc95075dff 100644
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c
@@ -585,6 +585,11 @@ EcGetPubKey (
     return FALSE;
   }
 
+  // MU_CHANGE [BEGIN] - CodeQL change
+  BnX = NULL;
+  BnY = NULL;
+  // MU_CHANGE [END] - CodeQL change
+
   EcKey    = (EC_KEY *)EcContext;
   Group    = EC_KEY_get0_group (EcKey);
   HalfSize = (EC_GROUP_get_degree (Group) + 7) / 8;
@@ -628,8 +633,16 @@ EcGetPubKey (
   RetVal = TRUE;
 
 fail:
-  BN_free (BnX);
-  BN_free (BnY);
+  // MU_CHANGE [BEGIN] - CodeQL change
+  if (BnX != NULL) {
+    BN_free (BnX);
+  }
+
+  if (BnY != NULL) {
+    BN_free (BnY);
+  }
+
+  // MU_CHANGE [END] - CodeQL change
   return RetVal;
 }