diff --git a/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt b/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt
index 8ce911e5c6..e4669e620b 100644
--- a/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt
+++ b/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt
@@ -18,6 +18,7 @@ enum class Instruction(var code: Int) {
 
 
     companion object {
-        fun byCode(code: Int): Instruction = values().find { it.code == code } ?: Unknown
+        private val values = values()
+        fun byCode(code: Int): Instruction = values.find { it.code == code } ?: Unknown
     }
 }
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/apdu/StatusWord.kt b/tangem-core/src/main/java/com/tangem/common/apdu/StatusWord.kt
index 34a0153d49..4cbc0d2a81 100644
--- a/tangem-core/src/main/java/com/tangem/common/apdu/StatusWord.kt
+++ b/tangem-core/src/main/java/com/tangem/common/apdu/StatusWord.kt
@@ -15,7 +15,8 @@ enum class StatusWord (val code: Int, val description: String){
     NeedPause(0x9789, "SW_NEED_PAUSE");
 
     companion object {
-        fun byCode(code: Int): StatusWord = values().find { it.code == code } ?: InvalidParams
+        private val values = values()
+        fun byCode(code: Int): StatusWord = values.find { it.code == code } ?: Unknown
     }
 
 }
diff --git a/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
index 33ecc7a0a2..71eb6d009f 100644
--- a/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
+++ b/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
@@ -108,9 +108,9 @@ enum class TlvTag(val code: Int) {
         }
     }
 
-
     companion object {
-        fun byCode(code: Int): TlvTag = values().find { it.code == code } ?: Unknown
+        private val values = values()
+        fun byCode(code: Int): TlvTag = values.find { it.code == code } ?: Unknown
     }
 }