diff --git a/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx b/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx
index 2b2d90b6b..33c001f5b 100644
--- a/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx
+++ b/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx
@@ -11,8 +11,8 @@ import {
   withHOC,
 } from 'platejs/react';
 import React, { type PropsWithChildren, useCallback, useMemo, useRef } from 'react';
-import type { BusterMetric } from '@/api/asset_interfaces/metric';
-import { useGetMetric } from '@/api/buster_rest/metrics';
+import type { BusterMetric, BusterMetricData } from '@/api/asset_interfaces/metric';
+import { useGetMetric, useGetMetricData } from '@/api/buster_rest/metrics';
 import { useSize } from '@/hooks/useSize';
 import { cn } from '@/lib/classMerge';
 import { GlobalVariablePlugin } from '../../plugins/global-variable-kit';
@@ -41,7 +41,11 @@ export const MetricElement = withHOC(
       { id: metricId },
       { select: useCallback((x: BusterMetric) => x?.chart_config?.selectedChartType, []) }
     );
-    const isTable = selectedChartType === 'table';
+    const { isFetched: isFetchedMetricData } = useGetMetricData(
+      { id: metricId },
+      { select: useCallback((x: BusterMetricData) => x, []) }
+    );
+    const isTable = selectedChartType === 'table' && isFetchedMetricData;
 
     const content = metricId ? (
       <MetricToolbar selectedMetricId={metricId}>