diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index 288d399817..8b33c12085 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -111,7 +111,7 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
     }
 
     suspend fun derivePublicKeys(
-        cardId: String,
+        cardId: String?,
         derivations: Map<ByteArrayKey, List<DerivationPath>>,
     ): CompletionResult<DerivationTaskResponse> {
         return runTaskAsyncReturnOnMain(DeriveMultipleWalletPublicKeysTask(derivations), cardId)
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
index 606ee227cc..27aa168f02 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
@@ -207,9 +207,8 @@ class TokensMiddleware {
         }
 
         scope.launch {
-            val card = scanResponse.card
             val result = tangemSdkManager.derivePublicKeys(
-                cardId = card.cardId,
+                cardId = null,
                 derivations = derivations,
             )
             when (result) {
@@ -232,7 +231,6 @@ class TokensMiddleware {
 
                     onSuccess(updatedScanResponse)
                 }
-
                 is CompletionResult.Failure -> {
                     store.dispatchDebugErrorNotification(TapError.CustomError("Error adding tokens"))
                 }