diff --git a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
index ebde5d27..1fc59fc6 100644
--- a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
+++ b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
@@ -3996,11 +3996,10 @@ private void readKeyBlobParams(short version, short parsedKeyBlob) {
         data[NONCE]= KMArray.cast(parsedKeyBlob).get((short) 2);
         data[AUTH_TAG] = KMArray.cast(parsedKeyBlob).get((short) 3);
         data[KEY_CHARACTERISTICS] = KMArray.cast(parsedKeyBlob).get((short) 4);
+        data[PUB_KEY] = KMType.INVALID_VALUE;
         if (KMArray.cast(parsedKeyBlob).length() == ASYM_KEY_BLOB_SIZE_V1) {
           data[PUB_KEY] = KMArray.cast(parsedKeyBlob).get((short) 5);
         }
-        data[CUSTOM_TAGS] = KMType.INVALID_VALUE;
-        data[PUB_KEY] = KMType.INVALID_VALUE;
         break;
       case (short) 2:
         data[SECRET] = KMArray.cast(parsedKeyBlob).get(KEY_BLOB_SECRET);