diff --git a/heatmapchart/src/components/HeatMapChart.tsx b/heatmapchart/src/components/HeatMapChart.tsx
index 141f40c9..a9a7ce50 100644
--- a/heatmapchart/src/components/HeatMapChart.tsx
+++ b/heatmapchart/src/components/HeatMapChart.tsx
@@ -13,7 +13,8 @@
 
 import { ReactElement, useMemo } from 'react';
 import { FormatOptions, TimeScale } from '@perses-dev/core';
-import { EChart, getFormattedAxis, useChartsTheme, useTimeZone } from '@perses-dev/components';
+import { useTimeZone } from '@perses-dev/plugin-system';
+import { EChart, getFormattedAxis, useChartsTheme } from '@perses-dev/components';
 import { use, EChartsCoreOption } from 'echarts/core';
 import { HeatmapChart as EChartsHeatmapChart } from 'echarts/charts';
 import { useTheme } from '@mui/material';
diff --git a/statushistorychart/src/StatusHistoryChartBase.tsx b/statushistorychart/src/StatusHistoryChartBase.tsx
index bd4cbe09..e5205cf3 100644
--- a/statushistorychart/src/StatusHistoryChartBase.tsx
+++ b/statushistorychart/src/StatusHistoryChartBase.tsx
@@ -26,7 +26,8 @@ import { CanvasRenderer } from 'echarts/renderers';
 import { TimeScale } from '@perses-dev/core';
 import { EChartsCoreOption } from 'echarts';
 import { FC } from 'react';
-import { EChart, useChartsTheme, useTimeZone } from '@perses-dev/components';
+import { useTimeZone } from '@perses-dev/plugin-system';
+import { EChart, useChartsTheme } from '@perses-dev/components';
 import { getFormattedStatusHistoryAxisLabel } from './utils/get-formatted-axis-label';
 import { generateTooltipHTML } from './StatusHistoryTooltip';
 
diff --git a/timeserieschart/src/TimeSeriesChartBase.tsx b/timeserieschart/src/TimeSeriesChartBase.tsx
index 9468ae2f..2796f9ae 100644
--- a/timeserieschart/src/TimeSeriesChartBase.tsx
+++ b/timeserieschart/src/TimeSeriesChartBase.tsx
@@ -57,9 +57,9 @@ import {
   TimeChartTooltip,
   TooltipConfig,
   useChartsContext,
-  useTimeZone,
   ZoomEventData,
 } from '@perses-dev/components';
+import { useTimeZone } from '@perses-dev/plugin-system';
 import { DatasetOption } from 'echarts/types/dist/shared';
 
 use([