diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
index 29ae9d45bc..1d46b341ec 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
@@ -145,7 +145,20 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWa
             when (result) {
                 is CompletionResult.Success -> {
                     primaryCard = result.data
-                    deriveKeys(createWalletResponse, session, callback)
+                    when {
+                        card.settings.isHDWalletAllowed -> {
+                            deriveKeys(createWalletResponse, session, callback)
+                        }
+                        else -> {
+                            callback(
+                                CompletionResult.Success(
+                                    CreateProductWalletTaskResponse(
+                                        card = session.environment.card!!, primaryCard = primaryCard
+                                    )
+                                )
+                            )
+                        }
+                    }
                 }
                 is CompletionResult.Failure -> {
                     callback(CompletionResult.Failure(result.error))
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index 271b9bf761..31931af76f 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.domain.tasks.product
 
-import com.tangem.*
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.common.CompletionResult
@@ -241,7 +240,7 @@ private class ScanWalletProcessor(
         callback: (result: CompletionResult<ScanResponse>) -> Unit
     ) {
         val derivations = collectDerivations(card)
-        if (derivations.isEmpty()) {
+        if (derivations.isEmpty() || !card.settings.isHDWalletAllowed) {
             callback(
                 CompletionResult.Success(
                     ScanResponse(