diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt
index 2db7541c5a..2f6b1d4a0c 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/api/OnboardingSeedPhrase.kt
@@ -54,7 +54,6 @@ private fun Content(screen: SeedPhraseScreen, uiState: OnboardingSeedPhraseState
                 state = uiState.introState,
             )
         }
-
         SeedPhraseScreen.AboutSeedPhrase -> {
             AboutSeedPhraseScreen(
                 state = uiState.aboutState,
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/DefaultSeedPhraseInteractor.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/DefaultSeedPhraseInteractor.kt
index d0cd349b55..f3152c931e 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/DefaultSeedPhraseInteractor.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/DefaultSeedPhraseInteractor.kt
@@ -96,7 +96,7 @@ internal class DefaultSeedPhraseInteractor constructor(
 }
 
 private fun MnemonicErrorResult.mapToError(): SeedPhraseError = when (this) {
-    MnemonicErrorResult.InvalidWordCount -> SeedPhraseError.InvalidEntropyLength
+    MnemonicErrorResult.InvalidWordCount -> SeedPhraseError.InvalidWordCount
     MnemonicErrorResult.InvalidEntropyLength -> SeedPhraseError.InvalidEntropyLength
     MnemonicErrorResult.InvalidWordsFile -> SeedPhraseError.InvalidWordsFile
     MnemonicErrorResult.InvalidChecksum -> SeedPhraseError.InvalidChecksum
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt
index dbb553ba63..9a44793b6f 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt
@@ -14,7 +14,7 @@ class SeedPhraseErrorConverter : ModuleMessageConverter<Pair<Context, SeedPhrase
         val (context, message) = source
 
         val convertedMessage = when (message) {
-            SeedPhraseError.InvalidEntropyLength -> {
+            SeedPhraseError.InvalidChecksum -> {
                 context.getString(R.string.onboarding_seed_mnemonic_invalid_checksum)
             }
             is SeedPhraseError.InvalidWords -> {
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
index b5d2b6a8d7..2e6e7587eb 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
@@ -25,7 +25,6 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
 /**
@@ -67,7 +66,6 @@ class SeedPhraseViewModel @Inject constructor(
     )
 
     private val textFieldsDebouncers = mutableMapOf<String, Debouncer>()
-    private var suggestionWordInserted: AtomicBoolean = AtomicBoolean(false)
 
     private var generatedMnemonicComponents: List<String>? = null
     private var importedMnemonicComponents: List<String>? = null
@@ -197,19 +195,14 @@ class SeedPhraseViewModel @Inject constructor(
 
         val debouncer = createOrGetDebouncer(MNEMONIC_DEBOUNCER)
         when {
-            suggestionWordInserted.getAndSet(false) -> {
-                debouncer.debounce(viewModelScope, MNEMONIC_DEBOUNCE_DELAY, dispatchers.single) {
-                    validateMnemonic(inputMnemonic)
-                }
-            }
-            isSameText && !isCursorMoved -> {
-                // do nothing
-            }
             isSameText && isCursorMoved -> {
                 debouncer.debounce(viewModelScope, MNEMONIC_DEBOUNCE_DELAY, dispatchers.single) {
                     updateSuggestions(fieldState)
                 }
             }
+            isSameText && !isCursorMoved -> {
+                // do nothing
+            }
             else -> {
                 debouncer.debounce(viewModelScope, MNEMONIC_DEBOUNCE_DELAY, dispatchers.single) {
                     updateSuggestions(fieldState)
@@ -243,7 +236,6 @@ class SeedPhraseViewModel @Inject constructor(
                     is SeedPhraseError.InvalidWords -> {
                         uiBuilder.importSeedPhrase.updateInvalidWords(uiState, error.words)
                     }
-
                     else -> uiState
                 }
                 updateUi { uiBuilder.importSeedPhrase.updateError(mediateState, error) }
@@ -366,7 +358,6 @@ class SeedPhraseViewModel @Inject constructor(
 
     private fun buttonSuggestedPhraseClick(suggestionIndex: Int) {
         viewModelScope.launchSingle {
-            suggestionWordInserted.set(true)
             val textFieldValue = uiState.importSeedPhraseState.tvSeedPhrase.textFieldValue
             val word = uiState.importSeedPhraseState.suggestionsList[suggestionIndex]
             val cursorPosition = textFieldValue.selection.end