diff --git a/app/build.gradle b/app/build.gradle
index bd0585009b..583846af6b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
 
-    implementation 'com.tangem:blockchain:1.106.0'
+    implementation 'com.tangem:blockchain:1.108.0'
     implementation 'com.tangem:core:1.80.0'
     implementation 'com.tangem:sdk:1.80.0'
 
diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 7f9eb116b1..9b3c5fb814 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -168,14 +168,14 @@ class TapWalletManager {
         withContext(Dispatchers.Main) {
             when (result) {
                 is Result.Success -> {
+                    val config = store.state.globalState.configManager?.config?: return@withContext
                     val payId = result.data
+                    if (!config.isPayIdEnabled) {
+                        store.dispatch(WalletAction.DisablePayId)
+                        return@withContext
+                    }
                     if (payId == null) {
-                        val config = store.state.globalState.configManager?.config?: return@withContext
-                        if (!config.payIdIsEnabled) {
-                            store.dispatch(WalletAction.DisablePayId)
-                        } else {
-                            store.dispatch(WalletAction.LoadPayId.NotCreated)
-                        }
+                        store.dispatch(WalletAction.LoadPayId.NotCreated)
                     } else {
                         store.dispatch(WalletAction.LoadPayId.Success(payId))
                     }
diff --git a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt
new file mode 100644
index 0000000000..e69de29bb2