diff --git a/web/oss/src/components/pages/observability/dashboard/AnalyticsDashboard.tsx b/web/oss/src/components/pages/observability/dashboard/AnalyticsDashboard.tsx
index 514f095cc..58913b797 100644
--- a/web/oss/src/components/pages/observability/dashboard/AnalyticsDashboard.tsx
+++ b/web/oss/src/components/pages/observability/dashboard/AnalyticsDashboard.tsx
@@ -1,7 +1,6 @@
 import {useMemo, type ComponentProps} from "react"
 
-import {ChartLine} from "@phosphor-icons/react"
-import {AreaChart} from "@tremor/react"
+import {ChartLineIcon} from "@phosphor-icons/react"
 import {Spin} from "antd"
 import {useAtom} from "jotai"
 import {createUseStyles} from "react-jss"
@@ -12,6 +11,7 @@ import {JSSTheme} from "@/oss/lib/Types"
 import {useObservabilityDashboard} from "@/oss/state/observability"
 import {observabilityDashboardTimeRangeAtom} from "@/oss/state/observability/dashboard"
 
+import CustomAreaChart from "./CustomAreaChart"
 import WidgetCard from "./widgetCard"
 
 const useStyles = createUseStyles((theme: JSSTheme) => ({
@@ -66,7 +66,7 @@ const useStyles = createUseStyles((theme: JSSTheme) => ({
 
 const EmptyChart = ({className}: {className: string}) => (
     <div className={className}>
-        <ChartLine size={18} />
+        <ChartLineIcon size={18} />
         <span>No data</span>
     </div>
 )
@@ -83,22 +83,15 @@ const AnalyticsDashboard = ({layout = "grid-2"}: AnalyticsDashboardProps) => {
     const chartData = useMemo(() => (data?.data?.length ? data.data : []), [data])
     const hasData = (data?.total_count ?? 0) > 0
 
-    const defaultGraphProps = useMemo<ComponentProps<typeof AreaChart>>(
+    const defaultGraphProps = useMemo<ComponentProps<typeof CustomAreaChart>>(
         () => ({
             className: "h-[140px]",
             colors: ["cyan-600", "rose"],
-            connectNulls: true,
-            tickGap: 20,
-            curveType: "monotone",
-            showGridLines: true,
-            showLegend: false,
+            tickCount: 5,
             index: "timestamp",
             data: chartData,
             categories: [],
             valueFormatter: (value) => formatCompactNumber(value),
-            yAxisWidth: 48,
-            showXAxis: true,
-            showYAxis: true,
         }),
         [chartData],
     )
@@ -142,7 +135,7 @@ const AnalyticsDashboard = ({layout = "grid-2"}: AnalyticsDashboardProps) => {
                         }
                     >
                         {hasData ? (
-                            <AreaChart
+                            <CustomAreaChart
                                 {...defaultGraphProps}
                                 categories={
                                     (data?.failure_rate ?? 0) > 0
@@ -169,7 +162,7 @@ const AnalyticsDashboard = ({layout = "grid-2"}: AnalyticsDashboardProps) => {
                         }
                     >
                         {hasData ? (
-                            <AreaChart
+                            <CustomAreaChart
                                 {...defaultGraphProps}
                                 categories={["latency"]}
                                 valueFormatter={(value) => `${formatCompactNumber(value)}ms`}
@@ -199,7 +192,7 @@ const AnalyticsDashboard = ({layout = "grid-2"}: AnalyticsDashboardProps) => {
                         }
                     >
                         {hasData ? (
-                            <AreaChart
+                            <CustomAreaChart
                                 {...defaultGraphProps}
                                 categories={["cost"]}
                                 colors={["cyan-600"]}
@@ -230,7 +223,7 @@ const AnalyticsDashboard = ({layout = "grid-2"}: AnalyticsDashboardProps) => {
                         }
                     >
                         {hasData ? (
-                            <AreaChart
+                            <CustomAreaChart
                                 {...defaultGraphProps}
                                 categories={["total_tokens"]}
                                 colors={["cyan-600"]}
diff --git a/web/oss/src/components/pages/observability/dashboard/CustomAreaChart.tsx b/web/oss/src/components/pages/observability/dashboard/CustomAreaChart.tsx
new file mode 100644
index 000000000..c7869bdfa
--- /dev/null
+++ b/web/oss/src/components/pages/observability/dashboard/CustomAreaChart.tsx
@@ -0,0 +1,126 @@
+import React from "react"
+
+import {theme} from "antd"
+import {
+    Area,
+    CartesianGrid,
+    AreaChart as ReAreaChart,
+    ResponsiveContainer,
+    Tooltip,
+    XAxis,
+    YAxis,
+} from "recharts"
+
+import {formatCompactNumber} from "@/oss/lib/helpers/formatters"
+
+interface CustomAreaChartProps {
+    data: any[]
+    categories: string[]
+    index: string
+    colors?: string[]
+    valueFormatter?: (value: number) => string
+    tickCount?: number
+    allowDecimals?: boolean
+    className?: string
+}
+
+// Map Tremor-like color names to hex values (simplified for this specific use case)
+// You might want to expand this or import from a central theme file if available
+const colorMap: Record<string, string> = {
+    "cyan-600": "#0891b2",
+    rose: "#e11d48",
+    gray: "#6b7280",
+}
+
+const CustomAreaChart: React.FC<CustomAreaChartProps> = ({
+    data,
+    categories,
+    index,
+    colors = ["cyan-600"],
+    valueFormatter = (value: number) => formatCompactNumber(value),
+    tickCount = 5,
+    allowDecimals = false,
+    className,
+}) => {
+    const {token} = theme.useToken()
+
+    return (
+        <div className={`w-full ${className}`}>
+            <ResponsiveContainer width="100%" height="100%">
+                <ReAreaChart data={data} margin={{top: 5, right: 5, left: -20, bottom: 0}}>
+                    <defs>
+                        {categories.map((category, idx) => {
+                            const colorKey = colors[idx % colors.length]
+                            const color = colorMap[colorKey] || colorKey
+                            return (
+                                <linearGradient
+                                    key={category}
+                                    id={`color-${category}`}
+                                    x1="0"
+                                    y1="0"
+                                    x2="0"
+                                    y2="1"
+                                >
+                                    <stop offset="5%" stopColor={color} stopOpacity={0.3} />
+                                    <stop offset="95%" stopColor={color} stopOpacity={0} />
+                                </linearGradient>
+                            )
+                        })}
+                    </defs>
+                    <CartesianGrid
+                        strokeDasharray="3 3"
+                        vertical={false}
+                        stroke={token.colorBorderSecondary}
+                    />
+                    <XAxis
+                        dataKey={index}
+                        tickLine={false}
+                        axisLine={false}
+                        tick={{fontSize: 12, fill: token.colorTextSecondary}}
+                        tickMargin={10}
+                        minTickGap={20}
+                    />
+                    <YAxis
+                        tickLine={false}
+                        axisLine={false}
+                        tick={{fontSize: 12, fill: token.colorTextSecondary}}
+                        tickFormatter={valueFormatter}
+                        tickCount={tickCount}
+                        interval={0}
+                        domain={[0, "auto"]}
+                        allowDecimals={allowDecimals}
+                    />
+                    <Tooltip
+                        contentStyle={{
+                            backgroundColor: token.colorBgElevated,
+                            borderColor: token.colorBorder,
+                            borderRadius: token.borderRadius,
+                            boxShadow: token.boxShadowSecondary,
+                            fontSize: 12,
+                        }}
+                        itemStyle={{color: token.colorText}}
+                        labelStyle={{color: token.colorTextSecondary, marginBottom: 8}}
+                        formatter={(value: number) => [valueFormatter(value), ""]}
+                    />
+                    {categories.map((category, idx) => {
+                        const colorKey = colors[idx % colors.length]
+                        const color = colorMap[colorKey] || colorKey
+                        return (
+                            <Area
+                                key={category}
+                                type="monotone"
+                                dataKey={category}
+                                stroke={color}
+                                fillOpacity={1}
+                                fill={`url(#color-${category})`}
+                                strokeWidth={2}
+                            />
+                        )
+                    })}
+                </ReAreaChart>
+            </ResponsiveContainer>
+        </div>
+    )
+}
+
+export default CustomAreaChart