diff --git a/apps/block_scout_web/assets/js/lib/currency.js b/apps/block_scout_web/assets/js/lib/currency.js
index ddb550252a..fcfe4bfed1 100644
--- a/apps/block_scout_web/assets/js/lib/currency.js
+++ b/apps/block_scout_web/assets/js/lib/currency.js
@@ -12,6 +12,7 @@ function formatTokenUsdValue (value) {
 
 function formatCurrencyValue (value, symbol) {
   symbol = symbol || '$'
+  if (isNaN(value) || value === '0') return 'N/A'
   if (value === 0) return `${symbol}0.000000`
   if (value < 0.000001) return `${window.localized['Less than']} ${symbol}0.000001`
   if (value < 1) return `${symbol}${numeral(value).format('0.000000')}`
diff --git a/apps/explorer/lib/explorer/chain/supply/token_bridge.ex b/apps/explorer/lib/explorer/chain/supply/token_bridge.ex
index 0f9f9d9414..5e7caaf989 100644
--- a/apps/explorer/lib/explorer/chain/supply/token_bridge.ex
+++ b/apps/explorer/lib/explorer/chain/supply/token_bridge.ex
@@ -60,7 +60,7 @@ defmodule Explorer.Chain.Supply.TokenBridge do
     total_market_cap_from_token_bridge = token_bridge_market_cap(%{usd_value: usd_value})
     total_market_cap_from_omni = total_market_cap_from_omni_bridge()
 
-    if total_market_cap_from_omni do
+    if Decimal.cmp(total_market_cap_from_omni, 0) == :gt do
       Decimal.add(total_market_cap_from_token_bridge, total_market_cap_from_omni)
     else
       total_market_cap_from_token_bridge
@@ -68,20 +68,14 @@ defmodule Explorer.Chain.Supply.TokenBridge do
   end
 
   def market_cap(_) do
-    total_market_cap_from_omni = total_market_cap_from_omni_bridge()
-
-    if total_market_cap_from_omni do
-      total_market_cap_from_omni
-    else
-      Decimal.new(0)
-    end
+    Decimal.new(0)
   end
 
   def token_bridge_market_cap(%{usd_value: usd_value}) when not is_nil(usd_value) do
-    total_coins_from_token_b = total_coins_from_token_bridge()
+    total_coins_from_token_bridge = get_total_coins_from_token_bridge()
 
-    if total_coins_from_token_b do
-      Decimal.mult(total_coins_from_token_b, usd_value)
+    if total_coins_from_token_bridge do
+      Decimal.mult(total_coins_from_token_bridge, usd_value)
     else
       Decimal.new(0)
     end
@@ -93,7 +87,7 @@ defmodule Explorer.Chain.Supply.TokenBridge do
 
   def total, do: total_chain_supply()
 
-  def total_coins_from_token_bridge, do: Bridge.fetch_token_bridge_total_supply()
+  def get_total_coins_from_token_bridge, do: Bridge.fetch_token_bridge_total_supply()
 
   def total_market_cap_from_omni_bridge, do: Bridge.fetch_omni_bridge_market_cap()
 
@@ -107,14 +101,14 @@ defmodule Explorer.Chain.Supply.TokenBridge do
           Decimal.new(1)
       end
 
-    total_coins_from_token_b = total_coins_from_token_bridge()
+    total_coins_from_token_bridge = get_total_coins_from_token_bridge()
     total_market_cap_from_omni = total_market_cap_from_omni_bridge()
 
-    if total_coins_from_token_b && total_market_cap_from_omni do
+    if Decimal.cmp(total_coins_from_token_bridge, 0) == :gt && Decimal.cmp(total_market_cap_from_omni, 0) == :gt do
       total_coins_from_omni_bridge = Decimal.div(total_market_cap_from_omni, usd_value)
-      Decimal.add(total_coins_from_token_b, total_coins_from_omni_bridge)
+      Decimal.add(total_coins_from_token_bridge, total_coins_from_omni_bridge)
     else
-      total_coins_from_token_b
+      total_coins_from_token_bridge
     end
   end
 
diff --git a/apps/explorer/lib/explorer/counters/bridge.ex b/apps/explorer/lib/explorer/counters/bridge.ex
index 020ed88fb1..4c8b6080e0 100644
--- a/apps/explorer/lib/explorer/counters/bridge.ex
+++ b/apps/explorer/lib/explorer/counters/bridge.ex
@@ -119,7 +119,7 @@ defmodule Explorer.Counters.Bridge do
     if bridges_table_exists?() do
       do_fetch_omni_bridge_market_cap(:ets.lookup(@bridges_table, @current_market_cap_from_omni_bridge_cache_key))
     else
-      0
+      Decimal.new(0)
     end
   end