diff --git a/components/trade/TradingViewChart.tsx b/components/trade/TradingViewChart.tsx
index f43bb2b9..c1551be7 100644
--- a/components/trade/TradingViewChart.tsx
+++ b/components/trade/TradingViewChart.tsx
@@ -718,15 +718,35 @@ const TradingViewChart = () => {
           ? mkt?.serumMarketExternal.toString()
           : mkt?.publicKey.toString()) || 'Loading'
 
+      const baseTokenBank =
+        mkt instanceof Serum3Market
+          ? mangoStore
+              .getState()
+              .group?.getFirstBankByTokenIndex(mkt.baseTokenIndex)
+          : mangoStore.getState().group?.getFirstBankByMint(WRAPPED_SOL_MINT)
+      const quoteTokenBank =
+        mkt instanceof Serum3Market
+          ? mangoStore
+              .getState()
+              .group?.getFirstBankByTokenIndex(mkt.quoteTokenIndex)
+          : mangoStore
+              .getState()
+              .group?.getFirstBankByMint(new PublicKey(USDC_MINT))
+
+      console.log(baseTokenBank, mkt, '@@@@@')
+
       const widgetOptions: ChartingLibraryWidgetOptions = {
         // debug: true,
         symbol: marketAddress,
-        datafeed: datafeed(
-          WRAPPED_SOL_MINT.toBase58(),
-          'SOL',
-          USDC_MINT,
-          'USDC',
-        ),
+        datafeed:
+          baseTokenBank && quoteTokenBank
+            ? datafeed(
+                baseTokenBank!.mint.toBase58(),
+                baseTokenBank!.name,
+                quoteTokenBank!.mint.toBase58(),
+                quoteTokenBank!.name,
+              )
+            : datafeed('', '', '', ''),
         interval:
           defaultProps.interval as ChartingLibraryWidgetOptions['interval'],
         container:
@@ -804,7 +824,7 @@ const TradingViewChart = () => {
         })
       })
     }
-  }, [theme, themeData, defaultProps, isMobile, userId])
+  }, [theme, themeData, defaultProps, isMobile, userId, selectedMarketName])
 
   // set a limit price from right click context menu
   useEffect(() => {
diff --git a/yarn.lock b/yarn.lock
index 1fb77eb0..9b5ef722 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9925,11 +9925,6 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klinecharts@8.6.3:
-  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/klinecharts/-/klinecharts-8.6.3.tgz#9ff2c40e31d86ca0600abc5fb8bf546c61daf130"
-  integrity sha512-hGDtWiMNywEDneZFmt+vZ6tOYutCDWV5FPBcXcn7L8kGwe73Q5yJayk8UzP9pIQSBWyxswWIySKh/BVFA6GhuQ==
-
 language-subtag-registry@^0.3.20:
   version "0.3.23"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"