diff --git a/src/app/modules/shared_models/token_model.nim b/src/app/modules/shared_models/token_model.nim
index cc23c8010a..24d8c08f0d 100644
--- a/src/app/modules/shared_models/token_model.nim
+++ b/src/app/modules/shared_models/token_model.nim
@@ -200,6 +200,10 @@ QtObject:
         if(balance.balance.getAmount() >= requiredGas):
           return true
 
+        break
+
+      break
+
     return false
 
   proc getTokenBalanceOnChain*(self: Model, chainId: int, tokenSymbol: string): CurrencyAmount =
@@ -213,6 +217,8 @@ QtObject:
 
         return balance.balance
 
+      break
+
     return newCurrencyAmount(
       0.0,
       tokenSymbol,
diff --git a/src/app/modules/shared_models/token_utils.nim b/src/app/modules/shared_models/token_utils.nim
index 57b60e11c8..aa24afb66d 100644
--- a/src/app/modules/shared_models/token_utils.nim
+++ b/src/app/modules/shared_models/token_utils.nim
@@ -24,7 +24,7 @@ proc walletTokenToItem*(
     currencyAmountToItem(t.getCurrencyBalance(enabledChainIds, currency), currencyFormat),
     t.getVisibleForNetwork(enabledChainIds),
     t.getVisibleForNetworkWithPositiveBalance(enabledChainIds),
-    t.getBalances(enabledChainIds).map(b => balanceToItem(b, tokenFormat)),
+    t.getBalances(chainIds).map(b => balanceToItem(b, tokenFormat)),
     t.description,
     t.assetWebsiteUrl,
     t.builtOn,
diff --git a/ui/imports/shared/controls/TokenBalancePerChainDelegate.qml b/ui/imports/shared/controls/TokenBalancePerChainDelegate.qml
index ce406961b7..06e4ea8131 100644
--- a/ui/imports/shared/controls/TokenBalancePerChainDelegate.qml
+++ b/ui/imports/shared/controls/TokenBalancePerChainDelegate.qml
@@ -15,7 +15,7 @@ StatusListItem {
     signal tokenSelected(var selectedToken)
 
     title: name
-    label: LocaleUtils.currencyAmountToLocaleString(enabledNetworkCurrencyBalance)
+    label: LocaleUtils.currencyAmountToLocaleString(totalCurrencyBalance)
     asset.name: symbol ? Style.png("tokens/" + symbol) : ""
     asset.isImage: true
     asset.width: 32