diff --git a/TangemSdk/TangemSdk/Common/TLV/TlvTag.swift b/TangemSdk/TangemSdk/Common/TLV/TlvTag.swift
index b6d3f43f..f289b9e5 100644
--- a/TangemSdk/TangemSdk/Common/TLV/TlvTag.swift
+++ b/TangemSdk/TangemSdk/Common/TLV/TlvTag.swift
@@ -202,21 +202,51 @@ public enum TlvTag: Byte {
                 .newPin3,
                 .walletPublicKey,
                 .walletPrivateKey,
-                .walletHDChain:
-            return true
-        case .unknown,
+                .walletHDChain,
                 .cardId,
                 .transactionOutHash,
-                .transactionOutHashSize,
                 .walletSignature,
+                .issuerTxSignature,
+                .cardPublicKey,
+                .cardSignature,
+                .manufacturerSignature,
+                .cardIDManufacturerSignature,
+                .terminalPublicKey,
+                .terminalTransactionSignature,
+                .acquirerPublicKey,
+                .manufacturerPublicKey,
+                .primaryCardLinkingKey,
+                .backupCardLinkingKey,
+                .backupCardLink,
+                .backupAttestSignature,
+                .backupCardPublicKey,
+                .sessionKeyA,
+                .sessionKeyB,
+                .certificate,
+                .issuerData,
+                .issuerDataSignature,
+                .cardData,
+                .proof,
+                .publicKeyChallenge,
+                .publicKeySalt,
+                .challenge,
+                .salt,
+                .cvc,
+                .issuerPublicKey,
+                .issuerTransactionPublicKey,
+                .resetPin,
+                .trOutRaw,
+                .cardWallet,
+                .fileData,
+                .fileSignature:
+            return true
+        case .unknown,
+                .transactionOutHashSize,
                 .walletRemainingSignatures,
                 .walletSignedHashes,
                 .pause,
                 .flash,
-                .issuerTxSignature,
                 .status,
-                .cardPublicKey,
-                .cardSignature,
                 .curveId,
                 .hashAlgId,
                 .signingMethod,
@@ -224,26 +254,13 @@ public enum TlvTag: Byte {
                 .pauseBeforePin2,
                 .settingsMask,
                 .userSettingsMask,
-                .cardData,
                 .ndefData,
                 .createWalletAtPersonalize,
                 .health,
                 .crExKey,
-                .publicKeyChallenge,
-                .publicKeySalt,
-                .challenge,
-                .salt,
                 .validationCounter,
-                .cvc,
-                .sessionKeyA,
-                .sessionKeyB,
                 .uid,
                 .manufacturerName,
-                .manufacturerSignature,
-                .issuerPublicKey,
-                .issuerTransactionPublicKey,
-                .issuerData,
-                .issuerDataSignature,
                 .issuerDataCounter,
                 .isActivated,
                 .activationSeed,
@@ -252,18 +269,14 @@ public enum TlvTag: Byte {
                 .userProtectedData,
                 .userCounter,
                 .userProtectedCounter,
-                .resetPin,
                 .codePageAddress,
                 .codePageCount,
                 .codeHash,
-                .trOutRaw,
                 .firmwareVersion,
                 .batchId,
                 .manufactureDateTime,
                 .issuerName,
                 .blockchainName,
-                .manufacturerPublicKey,
-                .cardIDManufacturerSignature,
                 .tokenSymbol,
                 .tokenContractAddress,
                 .tokenDecimal,
@@ -275,36 +288,23 @@ public enum TlvTag: Byte {
                 .checkWalletCounter,
                 .productMask,
                 .isLinked,
-                .terminalPublicKey,
-                .terminalTransactionSignature,
                 .legacyMode,
                 .interactionMode,
                 .offset,
                 .size,
-                .acquirerPublicKey,
                 .pin2IsDefault,
                 .pinIsDefault,
                 .walletIndex,
                 .walletsCount,
                 .walletData,
-                .cardWallet,
                 .fileIndex,
                 .fileSettings,
                 .fileTypeName,
-                .fileData,
-                .fileSignature,
                 .fileCounter,
                 .fileOwnerIndex,
                 .walletHDPath,
-                .certificate,
                 .backupStatus,
-                .backupCount,
-                .primaryCardLinkingKey,
-                .backupCardLinkingKey,
-                .backupCardLink,
-                .backupAttestSignature,
-                .backupCardPublicKey,
-                .proof:
+                .backupCount:
             return false
         }
     }