diff --git a/.changeset/long-pumas-draw.md b/.changeset/long-pumas-draw.md
new file mode 100644
index 000000000..6f5c0958b
--- /dev/null
+++ b/.changeset/long-pumas-draw.md
@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": patch
+---
+
+fix: Set better Chart Axis Bounds
diff --git a/packages/app/src/HDXMultiSeriesTimeChart.tsx b/packages/app/src/HDXMultiSeriesTimeChart.tsx
index e004c7e93..9dc769782 100644
--- a/packages/app/src/HDXMultiSeriesTimeChart.tsx
+++ b/packages/app/src/HDXMultiSeriesTimeChart.tsx
@@ -1,5 +1,6 @@
 import { memo, useCallback, useId, useMemo, useRef, useState } from 'react';
 import cx from 'classnames';
+import { add, isSameSecond, sub } from 'date-fns';
 import { withErrorBoundary } from 'react-error-boundary';
 import {
   Area,
@@ -16,6 +17,7 @@ import {
   XAxis,
   YAxis,
 } from 'recharts';
+import { AxisDomain } from 'recharts/types/util/types';
 import { DisplayType } from '@hyperdx/common-utils/dist/types';
 import { Popover } from '@mantine/core';
 import { notifications } from '@mantine/notifications';
@@ -24,7 +26,11 @@ import { IconCaretDownFilled, IconCaretUpFilled } from '@tabler/icons-react';
 import type { NumberFormat } from '@/types';
 import { COLORS, formatNumber, truncateMiddle } from '@/utils';
 
-import { LineData } from './ChartUtils';
+import {
+  convertGranularityToSeconds,
+  LineData,
+  toStartOfInterval,
+} from './ChartUtils';
 import { FormatTime, useFormatTime } from './useFormatTime';
 
 import styles from '../styles/HDXLineChart.module.scss';
@@ -404,6 +410,8 @@ export const MemoChart = memo(function MemoChart({
   previousPeriodOffsetSeconds,
   selectedSeriesNames,
   onToggleSeries,
+  granularity,
+  dateRangeEndInclusive = true,
 }: {
   graphResults: any[];
   setIsClickActive: (v: any) => void;
@@ -421,6 +429,8 @@ export const MemoChart = memo(function MemoChart({
   previousPeriodOffsetSeconds?: number;
   selectedSeriesNames?: Set<string>;
   onToggleSeries?: (seriesName: string, isShiftKey?: boolean) => void;
+  granularity: string;
+  dateRangeEndInclusive?: boolean;
 }) {
   const _id = useId();
   const id = _id.replace(/:/g, '');
@@ -495,12 +505,12 @@ export const MemoChart = memo(function MemoChart({
     });
   }, [lineData, displayType, id, isHovered, selectedSeriesNames]);
 
-  const yAxisDomain = useMemo(() => {
+  const yAxisDomain: AxisDomain = useMemo(() => {
     const hasSelection = selectedSeriesNames && selectedSeriesNames.size > 0;
 
     if (!hasSelection) {
       // No selection, let Recharts auto-calculate based on all data
-      return ['auto', 'auto'];
+      return [0, 'auto'];
     }
 
     // When series are selected, calculate domain based only on visible series
@@ -574,6 +584,28 @@ export const MemoChart = memo(function MemoChart({
     return map;
   }, [lineData]);
 
+  const xAxisDomain: AxisDomain = useMemo(() => {
+    let startTime = toStartOfInterval(dateRange[0], granularity);
+    let endTime = toStartOfInterval(dateRange[1], granularity);
+    const endTimeIsBoundaryAligned = isSameSecond(dateRange[1], endTime);
+    if (endTimeIsBoundaryAligned && !dateRangeEndInclusive) {
+      endTime = sub(endTime, {
+        seconds: convertGranularityToSeconds(granularity),
+      });
+    }
+
+    // For bar charts, extend the domain in both directions by half a granularity unit
+    // so that the full bar width is within the bounds of the chart
+    if (displayType === DisplayType.StackedBar) {
+      const halfGranularitySeconds =
+        convertGranularityToSeconds(granularity) / 2;
+      startTime = sub(startTime, { seconds: halfGranularitySeconds });
+      endTime = add(endTime, { seconds: halfGranularitySeconds });
+    }
+
+    return [startTime.getTime() / 1000, endTime.getTime() / 1000];
+  }, [dateRange, granularity, dateRangeEndInclusive, displayType]);
+
   return (
     <ResponsiveContainer
       width="100%"
@@ -708,10 +740,7 @@ export const MemoChart = memo(function MemoChart({
         )}
         <XAxis
           dataKey={timestampKey ?? 'ts_bucket'}
-          domain={[
-            dateRange[0].getTime() / 1000,
-            dateRange[1].getTime() / 1000,
-          ]}
+          domain={xAxisDomain}
           interval="preserveStartEnd"
           scale="time"
           type="number"
diff --git a/packages/app/src/components/DBTimeChart.tsx b/packages/app/src/components/DBTimeChart.tsx
index e405252e1..e800f18c4 100644
--- a/packages/app/src/components/DBTimeChart.tsx
+++ b/packages/app/src/components/DBTimeChart.tsx
@@ -750,6 +750,8 @@ function DBTimeChartComponent({
             previousPeriodOffsetSeconds={previousPeriodOffsetSeconds}
             selectedSeriesNames={selectedSeriesSet}
             onToggleSeries={handleToggleSeries}
+            granularity={granularity}
+            dateRangeEndInclusive={queriedConfig.dateRangeEndInclusive}
           />
         </>
       )}