diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index ef059014db..2a20c88628 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -87,7 +87,8 @@ class MainActivity : AppCompatActivity() {
             val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
             if (tag != null) {
                 intent.action = null
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.Home, false))
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
+                store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
                 store.dispatch(HomeAction.ReadCard)
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
index 28b425b515..56f0d70061 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
@@ -18,13 +18,9 @@ import com.tangem.wallet.R
 
 fun FragmentActivity.openFragment(screen: AppScreen, addToBackStack: Boolean = true) {
     val transaction = this.supportFragmentManager.beginTransaction()
-            .add(
-                    R.id.fragment_container,
-                    fragmentFactory(screen),
-                    screen.name
-            )
+    transaction.replace(R.id.fragment_container, fragmentFactory(screen), screen.name)
     if (addToBackStack && screen != AppScreen.Home) transaction.addToBackStack(null)
-    transaction.commitAllowingStateLoss();
+    transaction.commitAllowingStateLoss()
 }
 
 fun FragmentActivity.popBackTo(screen: AppScreen?, inclusive: Boolean = false) {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt
index 2d7032ba07..ca8e438a96 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletMiddleware.kt
@@ -282,9 +282,10 @@ private class TopUpMiddleware {
         when (action) {
             is WalletAction.TopUpAction.TopUp -> {
                 val config = store.state.globalState.configManager?.config ?: return
+                val defaultAddress = store.state.walletState.walletAddresses!!.list[0].address
                 val url = TopUpHelper.getUrl(
                         store.state.walletState.currencyData.currencySymbol!!,
-                        store.state.walletState.walletAddresses!!.selectedAddress.address,
+                        defaultAddress,
                         config.moonPayApiKey,
                         config.moonPayApiSecretKey
                 )