diff --git a/src/hooks/tradingView/useTradingView.ts b/src/hooks/tradingView/useTradingView.ts
index 8a4e8a1..756ecc2 100644
--- a/src/hooks/tradingView/useTradingView.ts
+++ b/src/hooks/tradingView/useTradingView.ts
@@ -44,7 +44,7 @@ export const useTradingView = ({
   const hasMarkets = marketIds.length > 0;
 
   useEffect(() => {
-    if (hasMarkets && isClientConnected) {
+    if (hasMarkets && isClientConnected && marketId) {
       const widgetOptions = getWidgetOptions();
       const widgetOverrides = getWidgetOverrides(appTheme);
       const options = {
@@ -75,7 +75,7 @@ export const useTradingView = ({
       tvWidgetRef.current = null;
       setIsChartReady(false);
     };
-  }, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork]);
+  }, [getCandlesForDatafeed, isClientConnected, hasMarkets, selectedLocale, selectedNetwork, !!marketId]);
 
   return { savedResolution };
 };
diff --git a/src/lib/orders.ts b/src/lib/orders.ts
index f2cf190..1aeb926 100644
--- a/src/lib/orders.ts
+++ b/src/lib/orders.ts
@@ -107,8 +107,8 @@ export const getHydratedTradingData = ({
   perpetualMarkets?: Record<string, PerpetualMarket>;
 }) => ({
   ...data,
-  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId].assetId],
-  stepSizeDecimals: perpetualMarkets?.[data.marketId].configs?.stepSizeDecimals,
-  tickSizeDecimals: perpetualMarkets?.[data.marketId].configs?.tickSizeDecimals,
+  asset: assets && perpetualMarkets && assets[perpetualMarkets[data.marketId]?.assetId],
+  stepSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.stepSizeDecimals,
+  tickSizeDecimals: perpetualMarkets?.[data.marketId]?.configs?.tickSizeDecimals,
   ...('side' in data && { orderSide: convertAbacusOrderSide(data.side) }),
 });
diff --git a/src/views/tables/FillsTable.tsx b/src/views/tables/FillsTable.tsx
index 576a85e..084d5d9 100644
--- a/src/views/tables/FillsTable.tsx
+++ b/src/views/tables/FillsTable.tsx
@@ -161,7 +161,7 @@ const getFillsTableColumnDef = ({
                 }[orderSide],
               })}
             </Styled.Side>
-            <Output type={OutputType.Text} value={asset.id} />
+            <Output type={OutputType.Text} value={asset?.id} />
           </Styled.TableCell>
         ),
       },