diff --git a/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx b/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx
index cb80ad6e0..350b560e9 100644
--- a/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx
+++ b/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx
@@ -90,7 +90,7 @@ export const EditDateFormat: React.FC<{
             showWarning={true}
             className="max-w-[300px]"
             icon={<CircleInfo />}
-            warningText="When UTC Offset is enabled, dates are displayed with timezone information. Use this when data is stored in different timezones or when timezone context matters. Buster tries the correct timezone and UTC Offset for each date. Note: When data is truncated (e.g., DATE_TRUNC to day/month/quarter), timezone differences are lost during truncation — the data is bucketed first, then timezone offsets are applied to the labels."
+            warningText="When enabled, dates show which timezone they're in. This is helpful when your data comes from different locations or when the time of day matters. Note: When data is grouped (e.g., by day, month, quarter or via a DATE_TRUNC command), timezone differences are lost during grouping — dates are grouped first, then timezone labels are added."
           />
           <Switch checked={isUTC} onCheckedChange={onUpdateUTC} />
         </div>
diff --git a/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx b/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx
index 9af05e122..7cefca240 100644
--- a/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx
+++ b/apps/web/src/controllers/MetricController/MetricViewChartController/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx
@@ -4,15 +4,21 @@ import { Switch } from '@/components/ui/switch';
 import { LabelAndInput } from '../../../Common/LabelAndInput';
 import { WarningIcon } from '../../../Common/WarningIcon';
 
+const ROW_COUNT_THRESHOLD = 25;
+
 export const EditShowDataLabel: React.FC<{
   showDataLabels: Required<ColumnSettings>['showDataLabels'];
   rowCount: number;
   onUpdateColumnSettingConfig: (columnSettings: Partial<ColumnSettings>) => void;
 }> = React.memo(({ showDataLabels, rowCount, onUpdateColumnSettingConfig }) => {
+  const showWarning = rowCount > ROW_COUNT_THRESHOLD;
   return (
     <LabelAndInput label="Show data labels">
       <div className="flex w-full justify-end gap-x-2">
-        <WarningIcon rowCount={rowCount} />
+        <WarningIcon
+          showWarning={showWarning}
+          warningText="Data labels will be hidden if there are too many."
+        />
         <Switch
           checked={showDataLabels}
           onCheckedChange={(v) => {