diff --git a/backend/services/token_prices.go b/backend/services/token_prices.go
index 41a1f1a..3d10ce4 100644
--- a/backend/services/token_prices.go
+++ b/backend/services/token_prices.go
@@ -10,8 +10,8 @@ var TokenPrices = map[string]float64{
 	//
 	// Mock prices are set to $100 per whole token for development.
 	// In the future, these prices will be fetched from real price feeds.
-	"gno.land/r/demo/wugnot:gno.land/r/gnoswap/v1/gns:3000:0":            10.0, // Example market ID for GNOT token
-	"gno.land/r/demo/wugnot:gno.land/r/gnoswap/v1/test_token/bar:3000:0": 10.0, // Example market ID for test token
+	"gno.land/r/gnoland/wugnot:gno.land/r/gnoswap/gns:3000:0":            10.0, // Example market ID for GNOT token
+	"gno.land/r/gnoland/wugnot:gno.land/r/gnoswap/test_token/bar:3000:0": 10.0, // Example market ID for test token
 }
 
 // GetTokenPrice returns the fiat price for a given market ID.
diff --git a/frontend/app/(app)/borrow/queries-mutations.ts b/frontend/app/(app)/borrow/queries-mutations.ts
index 6537228..2545948 100644
--- a/frontend/app/(app)/borrow/queries-mutations.ts
+++ b/frontend/app/(app)/borrow/queries-mutations.ts
@@ -25,7 +25,7 @@ export function useMarketsQuery() {
       const response = await getMarkets();
       
       // Transform API Market to MarketInfo format
-      const markets: MarketInfo[] = response.markets.map(market => ({
+      const markets: MarketInfo[] = (response.markets || []).map(market => ({
         // Market fields
         totalSupplyAssets: market.total_supply,
         totalSupplyShares: market.total_supply_shares,