diff --git a/app/src/main/java/com/tangem/tap/data/DefaultCardSdkProvider.kt b/app/src/main/java/com/tangem/tap/data/DefaultCardSdkProvider.kt
index 784db9dbc2..9918edc9f1 100644
--- a/app/src/main/java/com/tangem/tap/data/DefaultCardSdkProvider.kt
+++ b/app/src/main/java/com/tangem/tap/data/DefaultCardSdkProvider.kt
@@ -168,7 +168,7 @@ internal class DefaultCardSdkProvider @Inject constructor(
             secureStorage = secureStorage,
             authenticationManager = authenticationManager,
             keystoreManager = keystoreManager,
-            wordlist = Wordlist.getWordlist(activity),
+            wordlist = Wordlist.getWordlist(),
             config = config.apply {
                 val apiConfig = apiConfigsManager.getEnvironmentConfig(id = ApiConfig.ID.TangemTech)
                 tangemApiBaseUrl = apiConfig.baseUrl
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/common/repository/DefaultMnemonicRepository.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/common/repository/DefaultMnemonicRepository.kt
index 0c3b768d31..921f2d9db3 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/common/repository/DefaultMnemonicRepository.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/common/repository/DefaultMnemonicRepository.kt
@@ -1,6 +1,5 @@
 package com.tangem.features.hotwallet.common.repository
 
-import android.content.Context
 import com.tangem.crypto.bip39.DefaultMnemonic
 import com.tangem.crypto.bip39.EntropyLength
 import com.tangem.crypto.bip39.Mnemonic
@@ -8,15 +7,13 @@ import com.tangem.crypto.bip39.Wordlist
 import com.tangem.features.hotwallet.MnemonicRepository
 import com.tangem.features.hotwallet.MnemonicRepository.MnemonicType
 import com.tangem.sdk.extensions.getWordlist
-import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-internal class DefaultMnemonicRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
-) : MnemonicRepository {
-    private val wordlist = Wordlist.getWordlist(context)
+internal class DefaultMnemonicRepository @Inject constructor() : MnemonicRepository {
 
-    override val words: Set<String> = wordlist.words.toHashSet()
+    private val wordlist by lazy(LazyThreadSafetyMode.NONE) { Wordlist.getWordlist() }
+
+    override val words: Set<String> by lazy(LazyThreadSafetyMode.NONE) { wordlist.words.toHashSet() }
 
     override fun generateMnemonic(type: MnemonicType): Mnemonic = DefaultMnemonic(
         entropy = when (type) {
diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml
index 9a63fac2c9..bcb442df0a 100644
--- a/gradle/tangem_dependencies.toml
+++ b/gradle/tangem_dependencies.toml
@@ -11,7 +11,7 @@ tangemCardSdk = "releases-5.34-591"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
 tangemVico = "2.0.0-alpha.25-tangem12"
 #tangemVico = "0.0.1" # Keep it! - used for local builds ^
-tangemHotSdk = "develop-539"
+tangemHotSdk = "develop-547"
 #tangemHotSdk = "0.0.1" # Keep it! - used for local builds ^