diff --git a/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt b/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
index 81c7160c71..860f1e3374 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
@@ -74,8 +74,10 @@ class AdditionalFeedbackInfo {
 
     @Deprecated("Don't use it directly")
     fun setWalletsInfo(walletManagers: List<WalletManager>) {
-        walletsInfo.clear()
-        walletsInfo.addAll(elements = walletManagers.map(::createEmailWalletInfo))
+        synchronized(walletsInfo) {
+            walletsInfo.clear()
+            walletsInfo.addAll(elements = walletManagers.map(::createEmailWalletInfo))
+        }
     }
 
     fun updateOnSendError(
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt
index d18d5e3b61..1ec868ce0e 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt
@@ -5,6 +5,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.derivation.DerivationStyle
 import com.tangem.common.CompletionResult
 import com.tangem.common.card.EllipticCurve
+import com.tangem.common.doOnSuccess
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
@@ -269,7 +270,6 @@ object TokensMiddleware {
                     val updatedScanResponse = scanResponse.copy(derivedKeys = updatedDerivedKeys)
 
                     store.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
-                    delay(DELAY_SDK_DIALOG_CLOSE)
 
                     onSuccess(updatedScanResponse)
                 }
@@ -383,12 +383,11 @@ object TokensMiddleware {
             userWalletsListManager.update(
                 userWalletId = userWalletId,
                 update = { it.copy(scanResponse = updatedScanResponse) },
-            )
-
-            addCryptoCurrenciesUseCase(userWalletId, currencyList)
-
-            store.dispatchOnMain(NavigationAction.PopBackTo())
+            ).doOnSuccess {
+                addCryptoCurrenciesUseCase(userWalletId, currencyList)
+            }
         }
+        store.dispatchOnMain(NavigationAction.PopBackTo())
     }
 
     private suspend fun removeLegacyCurrenciesIfNeeded(currencies: List<Currency>) {