diff --git a/apps/server/src/api/v2/metric_files/[id]/download/GET.ts b/apps/server/src/api/v2/metric_files/[id]/download/GET.ts
index 386a43ccd..0578f88a8 100644
--- a/apps/server/src/api/v2/metric_files/[id]/download/GET.ts
+++ b/apps/server/src/api/v2/metric_files/[id]/download/GET.ts
@@ -1,4 +1,4 @@
-import { MetricDownloadParamsSchema } from '@buster/server-shared';
+import { MetricDownloadParamsSchema, MetricDownloadQueryParamsSchema } from '@buster/server-shared';
 import { zValidator } from '@hono/zod-validator';
 import { Hono } from 'hono';
 import { standardErrorHandler } from '../../../../../utils/response';
@@ -6,14 +6,20 @@ import { downloadMetricFileHandler } from './download-metric-file';
 
 const app = new Hono()
   // GET /metric_files/:id/download - Download metric file data as CSV
-  .get('/', zValidator('param', MetricDownloadParamsSchema), async (c) => {
-    const { id } = c.req.valid('param');
-    const user = c.get('busterUser');
+  .get(
+    '/',
+    zValidator('param', MetricDownloadParamsSchema),
+    zValidator('query', MetricDownloadQueryParamsSchema),
+    async (c) => {
+      const { id } = c.req.valid('param');
+      //  const { report_file_id } = c.req.valid('query');
+      const user = c.get('busterUser');
 
-    const response = await downloadMetricFileHandler(id, user);
+      const response = await downloadMetricFileHandler(id, user);
 
-    return c.json(response);
-  })
+      return c.json(response);
+    }
+  )
   .onError(standardErrorHandler);
 
 export default app;
diff --git a/apps/web/src/components/features/metrics/MetricViewChart/MetricDataTruncatedWarning.tsx b/apps/web/src/components/features/metrics/MetricViewChart/MetricDataTruncatedWarning.tsx
index cfcae0c0a..d1c257838 100644
--- a/apps/web/src/components/features/metrics/MetricViewChart/MetricDataTruncatedWarning.tsx
+++ b/apps/web/src/components/features/metrics/MetricViewChart/MetricDataTruncatedWarning.tsx
@@ -9,11 +9,13 @@ import { cn } from '@/lib/classMerge';
 interface MetricDataTruncatedWarningProps {
   className?: string;
   metricId: string;
+  metricVersionNumber: number | undefined;
 }
 
 export const MetricDataTruncatedWarning: React.FC<MetricDataTruncatedWarningProps> = ({
   className,
   metricId,
+  metricVersionNumber,
 }) => {
   const {
     mutateAsync: handleDownload,
@@ -42,7 +44,7 @@ export const MetricDataTruncatedWarning: React.FC<MetricDataTruncatedWarningProp
         </Text>
       </div>
       <Button
-        onClick={() => handleDownload({ id: metricId })}
+        onClick={() => handleDownload({ id: metricId, metric_version_number: metricVersionNumber })}
         loading={isGettingFile}
         variant={hasError ? 'danger' : 'default'}
         className="ml-4"
diff --git a/apps/web/src/components/features/metrics/MetricViewChart/MetricViewChart.tsx b/apps/web/src/components/features/metrics/MetricViewChart/MetricViewChart.tsx
index 45a3b5930..70c051de4 100644
--- a/apps/web/src/components/features/metrics/MetricViewChart/MetricViewChart.tsx
+++ b/apps/web/src/components/features/metrics/MetricViewChart/MetricViewChart.tsx
@@ -29,7 +29,9 @@ export const MetricViewChart: React.FC<{
             readOnly={readOnly}
             className={cardClassName}
           />
-          {hasMoreRecords && <MetricDataTruncatedWarning metricId={metricId} />}
+          {hasMoreRecords && (
+            <MetricDataTruncatedWarning metricId={metricId} metricVersionNumber={versionNumber} />
+          )}
         </div>
       </div>
     );
diff --git a/apps/web/src/components/features/metrics/threeDotMenuHooks.tsx b/apps/web/src/components/features/metrics/threeDotMenuHooks.tsx
index f0d6ca655..9c96c925c 100644
--- a/apps/web/src/components/features/metrics/threeDotMenuHooks.tsx
+++ b/apps/web/src/components/features/metrics/threeDotMenuHooks.tsx
@@ -164,10 +164,6 @@ export const useDownloadMetricDataCSV = ({
   metricVersionNumber: number | undefined;
   cacheDataId?: string;
 }) => {
-  const { data: metricData } = useGetMetricData(
-    { id: metricId, versionNumber: metricVersionNumber, cacheDataId },
-    { enabled: false }
-  );
   const { mutateAsync: handleDownload, isPending: isDownloading } = useDownloadMetricFile();
 
   return useMemo(
@@ -176,14 +172,16 @@ export const useDownloadMetricDataCSV = ({
       value: 'download-csv',
       icon: <Download4 />,
       loading: isDownloading,
+
       onClick: async () => {
-        const data = metricData?.data;
-        if (data) {
-          await handleDownload({ id: metricId, report_file_id: cacheDataId });
-        }
+        await handleDownload({
+          id: metricId,
+          report_file_id: cacheDataId,
+          metric_version_number: metricVersionNumber,
+        });
       },
     }),
-    [metricData, isDownloading]
+    [isDownloading]
   );
 };
 
diff --git a/packages/server-shared/src/metrics/download.types.ts b/packages/server-shared/src/metrics/download.types.ts
index 00413b102..bb9940628 100644
--- a/packages/server-shared/src/metrics/download.types.ts
+++ b/packages/server-shared/src/metrics/download.types.ts
@@ -8,6 +8,7 @@ export const MetricDownloadParamsSchema = z.object({
 });
 export const MetricDownloadQueryParamsSchema = z.object({
   report_file_id: z.string().uuid('Report file ID must be a valid UUID').optional(),
+  metric_version_number: z.number().optional(),
 });
 
 export type MetricDownloadParams = z.infer<typeof MetricDownloadParamsSchema>;