diff --git a/subgraphs/isolated-pools/src/operations/create.ts b/subgraphs/isolated-pools/src/operations/create.ts
index d387b00a..3f48495a 100644
--- a/subgraphs/isolated-pools/src/operations/create.ts
+++ b/subgraphs/isolated-pools/src/operations/create.ts
@@ -33,6 +33,8 @@ import {
   vagEURAddress,
   vankrBNBDeFiAddress,
   vankrBNBLiquidStakedBNBAddress,
+  vWETHLiquidStakedETHAddress,
+  vWETHCoreAddress,
 } from '../constants/addresses';
 import {
   getOrCreateMarketReward,
@@ -194,6 +196,10 @@ export function createMarket(
     market.symbol = 'vslisBNB_LiquidStakedBNB';
   }
 
+  if (vTokenAddress.equals(vWETHLiquidStakedETHAddress) || vTokenAddress.equals(vWETHCoreAddress)) {
+    market.underlyingToken = getOrCreateWrappedEthToken().id;
+  }
+
   market.save();
   return market;
 }
diff --git a/subgraphs/isolated-pools/src/operations/getOrCreate.ts b/subgraphs/isolated-pools/src/operations/getOrCreate.ts
index 9c5d9b81..4e0c2c8f 100644
--- a/subgraphs/isolated-pools/src/operations/getOrCreate.ts
+++ b/subgraphs/isolated-pools/src/operations/getOrCreate.ts
@@ -28,7 +28,6 @@ import {
   createPool,
   createRewardDistributor,
 } from './create';
-import { vWETHLiquidStakedETHAddress, vWETHCoreAddress } from '../constants/addresses';
 import { getMarketPosition, getMarket } from './get';
 import { vBifiAddress } from '../constants/addresses';
 
@@ -189,9 +188,6 @@ export function getOrCreateWrappedEthToken(): Token {
  */
 export function getOrCreateToken(asset: Address): Token {
   let tokenEntity = Token.load(getTokenId(asset));
-  if (asset.equals(vWETHCoreAddress) || asset.equals(vWETHLiquidStakedETHAddress)) {
-    return getOrCreateWrappedEthToken();
-  }
 
   if (!tokenEntity) {
     const erc20 = BEP20.bind(asset);