diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c
index ec94ebfa..671de4c1 100644
--- a/src/tpm2/NVMarshal.c
+++ b/src/tpm2/NVMarshal.c
@@ -3514,8 +3514,8 @@ static const struct _entry {
     { COMPILE_CONSTANT(MAX_RSA_KEY_BITS, EQ) },
     { COMPILE_CONSTANT(MAX_TDES_KEY_BITS, EQ) },
     { COMPILE_CONSTANT(MAX_AES_KEY_BITS, EQ) },
-    { COMPILE_CONSTANT(MAX_SM4_KEY_BITS, EQ) },
-    { COMPILE_CONSTANT(MAX_CAMELLIA_KEY_BITS, EQ) },
+    { COMPILE_CONSTANT(128, EQ) }, /* MAX_SM4_KEY_BITS      in older code was 128 also with SM4 not active */
+    { COMPILE_CONSTANT(128, EQ) }, /* MAX_CAMELLIA_KEY_BITS in older code was 128 also with CAMELLIA not active */
     { COMPILE_CONSTANT(ECC_NIST_P192, LE) },
     { COMPILE_CONSTANT(ECC_NIST_P224, LE) },
     { COMPILE_CONSTANT(ECC_NIST_P256, LE) },