diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/token/TokenBalanceFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/token/TokenBalanceFragment.kt
index 1fbee4f42f7..7346b4c971e 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/token/TokenBalanceFragment.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/token/TokenBalanceFragment.kt
@@ -20,7 +20,7 @@ class TokenBalanceFragment : BaseComposeFragment() {
         val wallet = navController.getInput<Wallet>()
         if (wallet == null) {
             Toast.makeText(App.instance, "Wallet is Null", Toast.LENGTH_SHORT).show()
-            navController.popBackStack()
+            navController.popBackStack(R.id.tokenBalanceFragment, true)
             return
         }
         val viewModel by viewModels<TokenBalanceViewModel> { TokenBalanceModule.Factory(wallet) }
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactionInfo/TransactionInfoFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactionInfo/TransactionInfoFragment.kt
index 517129d70e9..f7269378ea8 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactionInfo/TransactionInfoFragment.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactionInfo/TransactionInfoFragment.kt
@@ -46,7 +46,7 @@ class TransactionInfoFragment : BaseComposeFragment() {
     override fun GetContent(navController: NavController) {
         val viewItem = viewModelTxs.tmpItemToShow
         if (viewItem == null) {
-            navController.popBackStack()
+            navController.popBackStack(R.id.transactionInfoFragment, true)
             return
         }