diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 73293fcac5..a755b8e1d1 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -34,7 +34,9 @@ import com.tangem.core.analytics.models.Basic
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.di.RootAppComponentContext
+import com.tangem.core.ui.UiDependencies
 import com.tangem.core.ui.extensions.setStatusBarColor
+import com.tangem.core.ui.message.EventMessageEffect
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.windowsize.rememberWindowSize
 import com.tangem.datasource.utils.isNullOrEmpty
@@ -78,6 +80,9 @@ class OnboardingWalletFragment :
     StoreSubscriber<OnboardingWalletState>,
     FragmentOnBackPressedHandler {
 
+    @Inject
+    internal lateinit var uiDependencies: UiDependencies
+
     @Inject
     internal lateinit var onboardingManageTokensComponentFactory: OnboardingManageTokensComponent.Factory
 
@@ -290,6 +295,10 @@ class OnboardingWalletFragment :
                     windowSize = rememberWindowSize(activity = requireActivity()),
                 ) {
                     onboardingManageTokensComponent?.Content(modifier = Modifier.fillMaxSize())
+                    EventMessageEffect(
+                        messageHandler = uiDependencies.eventMessageHandler,
+                        snackbarHostState = uiDependencies.globalSnackbarHostState,
+                    )
                 }
             }
         }
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt
index 45ab931210..4c3c730ef6 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/OnboardingManageTokensModel.kt
@@ -272,6 +272,16 @@ internal class OnboardingManageTokensModel @Inject constructor(
         },
     ) {
         analyticsEventHandler.send(ManageTokensAnalyticEvent.ButtonLater)
+
+        saveManagedTokensUseCase(
+            userWalletId = requireNotNull(params.userWalletId),
+            currenciesToAdd = manageTokensListManager.currenciesToAdd.value,
+            currenciesToRemove = manageTokensListManager.currenciesToRemove.value,
+        ).getOrElse {
+            Timber.e(it, "Failed to save changes")
+            return@resource
+        }
+
         reduxStateHolder.dispatch(OnboardingManageTokensAction.CurrenciesSaved)
     }