diff --git a/static/app/components/core/form/scrapsForm.tsx b/static/app/components/core/form/scrapsForm.tsx
index 4230e9f4663bb3..3f5bcf597c7dd1 100644
--- a/static/app/components/core/form/scrapsForm.tsx
+++ b/static/app/components/core/form/scrapsForm.tsx
@@ -13,6 +13,7 @@ import {FieldMeta} from '@sentry/scraps/form/field/meta';
 import {FieldLayout} from '@sentry/scraps/form/layout';
 import {FieldGroup} from '@sentry/scraps/form/layout/fieldGroup';
 
+import {CheckboxField} from 'sentry/components/forms/fields/checkboxField';
 import {RequestError} from 'sentry/utils/requestError/requestError';
 
 import {InputField} from './field/inputField';
@@ -42,6 +43,7 @@ export const defaultFormOptions = formOptions({
 
 const fieldComponents = {
   Base: BaseField,
+  Checkbox: CheckboxField,
   Input: InputField,
   Number: NumberField,
   Password: PasswordField,
diff --git a/static/app/components/dataExport.spec.tsx b/static/app/components/dataExport.spec.tsx
deleted file mode 100644
index 8d5f687bb85094..00000000000000
--- a/static/app/components/dataExport.spec.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import {OrganizationFixture} from 'sentry-fixture/organization';
-
-import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {addErrorMessage} from 'sentry/actionCreators/indicator';
-import {DataExport, ExportQueryType} from 'sentry/components/dataExport';
-import type {Organization} from 'sentry/types/organization';
-
-jest.mock('sentry/actionCreators/indicator');
-
-const mockUnauthorizedOrg = OrganizationFixture({
-  features: [],
-});
-
-const mockAuthorizedOrg = OrganizationFixture({
-  features: ['discover-query'],
-});
-
-const mockPayload = {
-  queryType: ExportQueryType.ISSUES_BY_TAG,
-  queryInfo: {project_id: '1', group_id: '1027', key: 'user'},
-};
-
-const mockContext = (organization: Organization) => {
-  return {organization};
-};
-
-describe('DataExport', () => {
-  it('should not render anything for an unauthorized organization', () => {
-    render(<DataExport payload={mockPayload} />, {
-      ...mockContext(mockUnauthorizedOrg),
-    });
-    expect(screen.queryByRole('button')).not.toBeInTheDocument();
-  });
-
-  it('should render the button for an authorized organization', () => {
-    render(<DataExport payload={mockPayload} />, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-    expect(screen.getByText(/Export All to CSV/)).toBeInTheDocument();
-  });
-
-  it('should render the button for an unauthorized organization using flag override', () => {
-    render(<DataExport payload={mockPayload} overrideFeatureFlags />, {
-      ...mockContext(mockUnauthorizedOrg),
-    });
-    expect(screen.getByRole('button')).toBeInTheDocument();
-  });
-
-  it('should render custom children if provided', () => {
-    render(<DataExport payload={mockPayload}>This is an example string</DataExport>, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-    expect(screen.getByText(/This is an example string/)).toBeInTheDocument();
-  });
-
-  it('should respect the disabled prop and not be clickable', async () => {
-    const postDataExport = MockApiClient.addMockResponse({
-      url: `/organizations/${mockAuthorizedOrg.slug}/data-export/`,
-      method: 'POST',
-      body: {id: 721},
-    });
-
-    render(<DataExport payload={mockPayload} disabled />, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-
-    await userEvent.click(screen.getByRole('button'));
-    expect(postDataExport).not.toHaveBeenCalled();
-    expect(screen.getByRole('button')).toBeDisabled();
-  });
-
-  it('should send a request and disable itself when clicked', async () => {
-    const postDataExport = MockApiClient.addMockResponse({
-      url: `/organizations/${mockAuthorizedOrg.slug}/data-export/`,
-      method: 'POST',
-      body: {id: 721},
-    });
-    render(<DataExport payload={mockPayload} />, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-
-    await userEvent.click(screen.getByRole('button'));
-
-    expect(postDataExport).toHaveBeenCalledWith(
-      `/organizations/${mockAuthorizedOrg.slug}/data-export/`,
-      {
-        data: {
-          query_type: mockPayload.queryType,
-          query_info: mockPayload.queryInfo,
-        },
-        method: 'POST',
-        error: expect.anything(),
-        success: expect.anything(),
-      }
-    );
-
-    await waitFor(() => {
-      expect(screen.getByRole('button')).toBeDisabled();
-    });
-  });
-
-  it('should reset the state when receiving a new payload', async () => {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${mockAuthorizedOrg.slug}/data-export/`,
-      method: 'POST',
-      body: {id: 721},
-    });
-
-    const {rerender} = render(<DataExport payload={mockPayload} />, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-
-    await userEvent.click(screen.getByText(/Export All to CSV/));
-    await waitFor(() => {
-      expect(screen.getByRole('button')).toBeDisabled();
-    });
-
-    rerender(
-      <DataExport payload={{...mockPayload, queryType: ExportQueryType.DISCOVER}} />
-    );
-
-    await waitFor(() => {
-      expect(screen.getByRole('button')).toBeEnabled();
-    });
-  });
-
-  it('should display default error message if non provided', async () => {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${mockAuthorizedOrg.slug}/data-export/`,
-      method: 'POST',
-      statusCode: 400,
-    });
-
-    render(<DataExport payload={mockPayload} />, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-
-    await userEvent.click(screen.getByRole('button'));
-
-    await waitFor(() => {
-      expect(addErrorMessage).toHaveBeenCalledWith(
-        "We tried our hardest, but we couldn't export your data. Give it another go."
-      );
-    });
-
-    await waitFor(() => {
-      expect(screen.getByRole('button')).toBeEnabled();
-    });
-  });
-
-  it('should display provided error message', async () => {
-    MockApiClient.addMockResponse({
-      url: `/organizations/${mockAuthorizedOrg.slug}/data-export/`,
-      method: 'POST',
-      statusCode: 400,
-      body: {detail: 'uh oh'},
-    });
-
-    render(<DataExport payload={mockPayload} />, {
-      ...mockContext(mockAuthorizedOrg),
-    });
-
-    await userEvent.click(screen.getByRole('button'));
-
-    await waitFor(() => {
-      expect(addErrorMessage).toHaveBeenCalledWith('uh oh');
-    });
-  });
-});
diff --git a/static/app/components/dataExport.tsx b/static/app/components/dataExport.tsx
index 5593a2db03d198..859792927c1ed8 100644
--- a/static/app/components/dataExport.tsx
+++ b/static/app/components/dataExport.tsx
@@ -1,25 +1,16 @@
-import {useCallback, useEffect, useRef, useState} from 'react';
+import {useEffect, useRef} from 'react';
 import debounce from 'lodash/debounce';
 
 import {Button} from '@sentry/scraps/button';
 
-import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import Feature from 'sentry/components/acl/feature';
+import {ExportQueryType, useDataExport} from 'sentry/components/useDataExport';
 import {t} from 'sentry/locale';
-import {useApi} from 'sentry/utils/useApi';
-import {useOrganization} from 'sentry/utils/useOrganization';
 
-// NOTE: Coordinate with other ExportQueryType (src/sentry/data_export/base.py)
-export enum ExportQueryType {
-  ISSUES_BY_TAG = 'Issues-by-Tag',
-  DISCOVER = 'Discover',
-  EXPLORE = 'Explore',
-}
-
-interface DataExportPayload {
+type DataExportPayload = {
   queryInfo: any;
   queryType: ExportQueryType; // TODO(ts): Formalize different possible payloads
-}
+};
 
 interface DataExportProps {
   payload: DataExportPayload;
@@ -31,69 +22,6 @@ interface DataExportProps {
   size?: 'xs' | 'sm' | 'md';
 }
 
-export function useDataExport({
-  payload,
-  inProgressCallback,
-  unmountedRef,
-}: {
-  payload: DataExportPayload;
-  inProgressCallback?: (inProgress: boolean) => void;
-  unmountedRef?: React.RefObject<boolean>;
-}) {
-  const organization = useOrganization();
-  const api = useApi();
-
-  return useCallback(() => {
-    inProgressCallback?.(true);
-
-    // This is a fire and forget request.
-    api
-      .requestPromise(`/organizations/${organization.slug}/data-export/`, {
-        includeAllArgs: true,
-        method: 'POST',
-        data: {
-          query_type: payload.queryType,
-          query_info: payload.queryInfo,
-        },
-      })
-      .then(([_data, _, response]) => {
-        // If component has unmounted, don't do anything
-        if (unmountedRef?.current) {
-          return;
-        }
-
-        addSuccessMessage(
-          response?.status === 201
-            ? t(
-                "Sit tight. We'll shoot you an email when your data is ready for download."
-              )
-            : t("It looks like we're already working on it. Sit tight, we'll email you.")
-        );
-      })
-      .catch(err => {
-        // If component has unmounted, don't do anything
-        if (unmountedRef?.current) {
-          return;
-        }
-        const message =
-          err?.responseJSON?.detail ??
-          t(
-            "We tried our hardest, but we couldn't export your data. Give it another go."
-          );
-
-        addErrorMessage(message);
-        inProgressCallback?.(false);
-      });
-  }, [
-    payload.queryInfo,
-    payload.queryType,
-    organization.slug,
-    api,
-    inProgressCallback,
-    unmountedRef,
-  ]);
-}
-
 export function DataExport({
   children,
   disabled,
@@ -104,27 +32,11 @@ export function DataExport({
   onClick,
 }: DataExportProps): React.ReactElement {
   const unmountedRef = useRef(false);
-  const [inProgress, setInProgress] = useState(false);
-  const handleDataExport = useDataExport({
+  const {isExportWorking, runExport} = useDataExport({
     payload,
     unmountedRef,
-    inProgressCallback: setInProgress,
   });
 
-  // We clear the indicator if export props change so that the user
-  // can fire another export without having to wait for the previous one to finish.
-  useEffect(() => {
-    if (inProgress) {
-      setInProgress(false);
-    }
-    // We are skipping the inProgress dependency because it would have fired on each handleDataExport
-    // call and would have immediately turned off the value giving users no feedback on their click action.
-    // An alternative way to handle this would have probably been to key the component by payload/queryType,
-    // but that seems like it can be a complex object so tracking changes could result in very brittle behavior.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [payload.queryType, payload.queryInfo]);
-
-  // Tracking unmounting of the component to prevent setState call on unmounted component
   useEffect(() => {
     return () => {
       unmountedRef.current = true;
@@ -132,13 +44,15 @@ export function DataExport({
   }, []);
 
   const handleClick = () => {
-    debounce(handleDataExport, 500)();
+    debounce(() => {
+      void runExport();
+    }, 500)();
     onClick?.();
   };
 
   return (
     <Feature features={overrideFeatureFlags ? [] : 'organizations:discover-query'}>
-      {inProgress ? (
+      {isExportWorking ? (
         <Button
           size={size}
           priority="default"
diff --git a/static/app/components/useDataExport.ts b/static/app/components/useDataExport.ts
new file mode 100644
index 00000000000000..c67b6c0b0a7909
--- /dev/null
+++ b/static/app/components/useDataExport.ts
@@ -0,0 +1,123 @@
+import {useCallback, useEffect} from 'react';
+
+import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
+import {t} from 'sentry/locale';
+import {fetchMutationWithStatus, useMutation} from 'sentry/utils/queryClient';
+import {RequestError} from 'sentry/utils/requestError/requestError';
+import {useOrganization} from 'sentry/utils/useOrganization';
+import type {OurLogFieldKey} from 'sentry/views/explore/logs/types';
+
+// NOTE: Coordinate with other ExportQueryType (src/sentry/data_export/base.py)
+export enum ExportQueryType {
+  ISSUES_BY_TAG = 'Issues-by-Tag',
+  DISCOVER = 'Discover',
+  EXPLORE = 'Explore',
+}
+
+export interface LogsQueryInfo {
+  dataset: 'logs';
+  field: OurLogFieldKey[];
+  project: number[];
+  query: string;
+  sort: string[];
+  end?: string;
+  environment?: string[];
+  start?: string;
+  statsPeriod?: string;
+}
+
+type DataExportPayload = {
+  queryInfo: any;
+  queryType: ExportQueryType; // TODO(ts): Formalize different possible payloads
+};
+
+type DataExportInvokeOptions = {
+  allColumns: boolean;
+  format: 'csv' | 'json';
+  limit: number;
+};
+
+function getDataExportErrorMessage(error: unknown): string {
+  if (error instanceof RequestError) {
+    const detail = error.responseJSON?.detail;
+    if (typeof detail === 'string') {
+      return detail;
+    }
+  }
+  return t("We tried our hardest, but we couldn't export your data. Give it another go.");
+}
+
+export function useDataExport({
+  payload,
+  inProgressCallback,
+  unmountedRef,
+}: {
+  payload: DataExportPayload;
+  inProgressCallback?: (inProgress: boolean) => void;
+  unmountedRef?: React.RefObject<boolean>;
+}) {
+  const organization = useOrganization();
+
+  const mutation = useMutation({
+    mutationFn: (invokeOptions?: DataExportInvokeOptions) => {
+      const data: Record<string, unknown> = {
+        query_type: payload.queryType,
+        query_info: payload.queryInfo,
+      };
+      if (typeof invokeOptions?.limit === 'number') {
+        data.limit = invokeOptions.limit;
+      }
+
+      return fetchMutationWithStatus({
+        method: 'POST',
+        url: `/organizations/${organization.slug}/data-export/`,
+        data,
+      });
+    },
+    onMutate: () => {
+      inProgressCallback?.(true);
+    },
+    onSuccess: result => {
+      if (unmountedRef?.current) {
+        return;
+      }
+      addSuccessMessage(
+        result.statusCode === 201
+          ? t("Sit tight. We'll shoot you an email when your data is ready for download.")
+          : t("It looks like we're already working on it. Sit tight, we'll email you.")
+      );
+    },
+    onError: (error: unknown) => {
+      if (unmountedRef?.current) {
+        return;
+      }
+      addErrorMessage(getDataExportErrorMessage(error));
+      inProgressCallback?.(false);
+    },
+  });
+
+  const {reset} = mutation;
+
+  useEffect(() => {
+    reset();
+  }, [payload.queryInfo, payload.queryType, reset]);
+
+  const runExport = useCallback(
+    async (invokeOptions?: DataExportInvokeOptions): Promise<boolean> => {
+      try {
+        await mutation.mutateAsync(invokeOptions);
+        if (unmountedRef?.current) {
+          return false;
+        }
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    [mutation, unmountedRef]
+  );
+
+  const isExportWorking = mutation.isPending || mutation.isSuccess;
+
+  return {isExportWorking, mutation, runExport};
+}
diff --git a/static/app/utils/downloadFromHref.ts b/static/app/utils/downloadFromHref.ts
new file mode 100644
index 00000000000000..1e8446bc81ff8c
--- /dev/null
+++ b/static/app/utils/downloadFromHref.ts
@@ -0,0 +1,8 @@
+export function downloadFromHref(filename: string, href: string) {
+  const link = document.createElement('a');
+  link.setAttribute('href', href);
+  link.setAttribute('download', filename);
+  document.body.appendChild(link);
+  link.click();
+  link.remove();
+}
diff --git a/static/app/utils/downloadObjectAsJson.tsx b/static/app/utils/downloadObjectAsJson.tsx
index de09d8e97d230d..edf50ae716f509 100644
--- a/static/app/utils/downloadObjectAsJson.tsx
+++ b/static/app/utils/downloadObjectAsJson.tsx
@@ -1,11 +1,8 @@
-export function downloadObjectAsJson(exportObj: any, exportName: any) {
-  const dataStr = `data:text/json;charset=utf-8,${encodeURIComponent(
-    JSON.stringify(exportObj)
-  )}`;
-  const downloadAnchorNode = document.createElement('a');
-  downloadAnchorNode.setAttribute('href', dataStr);
-  downloadAnchorNode.setAttribute('download', `${exportName}.json`);
-  document.body.appendChild(downloadAnchorNode); // required for firefox
-  downloadAnchorNode.click();
-  downloadAnchorNode.remove();
+import {downloadFromHref} from 'sentry/utils/downloadFromHref';
+
+export function downloadObjectAsJson(exportObj: unknown, exportName: string) {
+  downloadFromHref(
+    `${exportName}.json`,
+    `data:text/json;charset=utf-8,${encodeURIComponent(JSON.stringify(exportObj))}`
+  );
 }
diff --git a/static/app/utils/queryClient.tsx b/static/app/utils/queryClient.tsx
index 7d20d68df52ce5..dcdd634277f78d 100644
--- a/static/app/utils/queryClient.tsx
+++ b/static/app/utils/queryClient.tsx
@@ -270,4 +270,31 @@ export function fetchMutation<TResponseData = unknown>(
   });
 }
 
+type FetchMutationWithStatusResult<TData = unknown> = {
+  data: TData;
+  statusCode: number;
+};
+
+/**
+ * Like {@link fetchMutation} but returns HTTP status for mutations that must
+ * distinguish responses (e.g. 201 created vs 200 OK).
+ */
+export function fetchMutationWithStatus<TResponseData = unknown>(
+  variables: ApiMutationVariables
+): Promise<FetchMutationWithStatusResult<TResponseData>> {
+  const {method, url, options, data} = variables;
+
+  return QUERY_API_CLIENT.requestPromise(url, {
+    method,
+    query: options?.query,
+    headers: options?.headers,
+    host: options?.host,
+    data,
+    includeAllArgs: true,
+  }).then(([json, , resp]) => ({
+    data: json as TResponseData,
+    statusCode: resp?.status ?? 0,
+  }));
+}
+
 export * from '@tanstack/react-query';
diff --git a/static/app/views/dataExport/dataDownload.spec.tsx b/static/app/views/dataExport/dataDownload.spec.tsx
index e36a78cb829ff4..97677c7f781759 100644
--- a/static/app/views/dataExport/dataDownload.spec.tsx
+++ b/static/app/views/dataExport/dataDownload.spec.tsx
@@ -3,7 +3,7 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {render, screen, waitForElementToBeRemoved} from 'sentry-test/reactTestingLibrary';
 import {textWithMarkupMatcher} from 'sentry-test/utils';
 
-import {ExportQueryType} from 'sentry/components/dataExport';
+import {ExportQueryType} from 'sentry/components/useDataExport';
 import DataDownload, {DownloadStatus} from 'sentry/views/dataExport/dataDownload';
 
 describe('DataDownload', () => {
diff --git a/static/app/views/dataExport/dataDownload.tsx b/static/app/views/dataExport/dataDownload.tsx
index 6863befdd30cd6..401155205fc5d6 100644
--- a/static/app/views/dataExport/dataDownload.tsx
+++ b/static/app/views/dataExport/dataDownload.tsx
@@ -3,10 +3,10 @@ import styled from '@emotion/styled';
 
 import {Button, LinkButton} from '@sentry/scraps/button';
 
-import {ExportQueryType} from 'sentry/components/dataExport';
 import {DateTime} from 'sentry/components/dateTime';
 import {LoadingIndicator} from 'sentry/components/loadingIndicator';
 import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
+import {ExportQueryType} from 'sentry/components/useDataExport';
 import {IconDownload} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
diff --git a/static/app/views/discover/table/tableActions.tsx b/static/app/views/discover/table/tableActions.tsx
index 8b0f6c315994d8..94250d93312578 100644
--- a/static/app/views/discover/table/tableActions.tsx
+++ b/static/app/views/discover/table/tableActions.tsx
@@ -6,8 +6,9 @@ import {Button} from '@sentry/scraps/button';
 import Feature from 'sentry/components/acl/feature';
 import {FeatureDisabled} from 'sentry/components/acl/featureDisabled';
 import {GuideAnchor} from 'sentry/components/assistant/guideAnchor';
-import {DataExport, ExportQueryType} from 'sentry/components/dataExport';
+import {DataExport} from 'sentry/components/dataExport';
 import {Hovercard} from 'sentry/components/hovercard';
+import {ExportQueryType} from 'sentry/components/useDataExport';
 import {IconDownload, IconSliders, IconTag} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import type {OrganizationSummary} from 'sentry/types/organization';
diff --git a/static/app/views/explore/components/exploreExport.tsx b/static/app/views/explore/components/exploreExport.tsx
index ab70e73aae5ca4..dcd8c93373a143 100644
--- a/static/app/views/explore/components/exploreExport.tsx
+++ b/static/app/views/explore/components/exploreExport.tsx
@@ -1,13 +1,12 @@
-import type React from 'react';
-
 import {Button} from '@sentry/scraps/button';
 
-import {DataExport, ExportQueryType} from 'sentry/components/dataExport';
+import {DataExport} from 'sentry/components/dataExport';
+import {ExportQueryType} from 'sentry/components/useDataExport';
 import {IconDownload} from 'sentry/icons';
 import {t} from 'sentry/locale';
-import type {Organization} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {getExportDisabledTooltip} from 'sentry/views/explore/components/getExportDisabledTooltip';
 import {TraceItemDataset} from 'sentry/views/explore/types';
 
 interface QueryInfo {
@@ -22,11 +21,11 @@ interface QueryInfo {
 }
 
 type BaseExploreExportProps = {
-  disabled: boolean;
   hasReachedCSVLimit: boolean;
   isDataEmpty: boolean;
   isDataError: boolean;
   isDataLoading: boolean;
+  disabled?: boolean;
   downloadAsCsv?: () => void;
 };
 
@@ -42,28 +41,9 @@ type OtherExploreExportProps = BaseExploreExportProps & {
 
 type ExploreExportProps = LogsExploreExportProps | OtherExploreExportProps;
 
-function getDisabledTooltip(
-  props: ExploreExportProps,
-  _organization: Organization
-): string | undefined {
-  if (props.isDataLoading) {
-    return t('Loading...');
-  }
-  if (props.isDataError) {
-    return t('Unable to export due to an error');
-  }
-  if (props.isDataEmpty) {
-    return t('No data to export');
-  }
-  return undefined;
-}
-
-export function ExploreExport(props: LogsExploreExportProps): React.ReactElement;
-export function ExploreExport(props: OtherExploreExportProps): React.ReactElement;
 export function ExploreExport(props: ExploreExportProps) {
   const organization = useOrganization();
-
-  const disabledTooltip = getDisabledTooltip(props, organization);
+  const disabledTooltip = getExportDisabledTooltip(props);
   const disabled = props.disabled || !!disabledTooltip;
 
   const handleExport = () => {
diff --git a/static/app/views/explore/components/getExportDisabledTooltip.ts b/static/app/views/explore/components/getExportDisabledTooltip.ts
new file mode 100644
index 00000000000000..21a3247130025c
--- /dev/null
+++ b/static/app/views/explore/components/getExportDisabledTooltip.ts
@@ -0,0 +1,22 @@
+import {t} from 'sentry/locale';
+
+interface ExportDisabledTooltipOptions {
+  isDataEmpty?: boolean;
+  isDataError?: boolean;
+  isDataLoading?: boolean;
+}
+
+export function getExportDisabledTooltip(
+  props: ExportDisabledTooltipOptions
+): string | undefined {
+  if (props.isDataLoading) {
+    return t('Loading...');
+  }
+  if (props.isDataError) {
+    return t('Unable to export due to an error');
+  }
+  if (props.isDataEmpty) {
+    return t('No data to export');
+  }
+  return undefined;
+}
diff --git a/static/app/views/explore/logs/createLogDownloadFilename.ts b/static/app/views/explore/logs/createLogDownloadFilename.ts
new file mode 100644
index 00000000000000..deabb682221055
--- /dev/null
+++ b/static/app/views/explore/logs/createLogDownloadFilename.ts
@@ -0,0 +1,6 @@
+import {getUtcDateString} from 'sentry/utils/dates';
+
+export function createLogDownloadFilename(base: string, format: string) {
+  const now = new Date();
+  return `${base} ${getUtcDateString(now)}.${format}`;
+}
diff --git a/static/app/views/explore/logs/downloadLogs.ts b/static/app/views/explore/logs/downloadLogs.ts
new file mode 100644
index 00000000000000..b7dd3116a97552
--- /dev/null
+++ b/static/app/views/explore/logs/downloadLogs.ts
@@ -0,0 +1,26 @@
+import {downloadLogsAsCsv} from 'sentry/views/explore/logs/downloadLogsAsCsv';
+import {downloadLogsAsJson} from 'sentry/views/explore/logs/downloadLogsAsJson';
+import type {OurLogFieldKey, OurLogsResponseItem} from 'sentry/views/explore/logs/types';
+
+interface DownloadLogsOptions {
+  fields: OurLogFieldKey[];
+  filename: string;
+  format: 'csv' | 'json';
+  limit: number;
+  tableData: OurLogsResponseItem[];
+}
+
+export function downloadLogs({
+  format,
+  tableData,
+  fields,
+  filename,
+  limit,
+}: DownloadLogsOptions) {
+  switch (format) {
+    case 'csv':
+      return downloadLogsAsCsv(tableData.slice(0, limit), fields, filename);
+    case 'json':
+      return downloadLogsAsJson(tableData, filename);
+  }
+}
diff --git a/static/app/views/explore/logs/logsExportCsv.tsx b/static/app/views/explore/logs/downloadLogsAsCsv.ts
similarity index 68%
rename from static/app/views/explore/logs/logsExportCsv.tsx
rename to static/app/views/explore/logs/downloadLogsAsCsv.ts
index 5db23dc8d2c7e6..cc26492096f55d 100644
--- a/static/app/views/explore/logs/logsExportCsv.tsx
+++ b/static/app/views/explore/logs/downloadLogsAsCsv.ts
@@ -1,6 +1,7 @@
 import Papa from 'papaparse';
 
-import {getUtcDateString} from 'sentry/utils/dates';
+import {downloadFromHref} from 'sentry/utils/downloadFromHref';
+import {createLogDownloadFilename} from 'sentry/views/explore/logs/createLogDownloadFilename';
 import type {OurLogFieldKey, OurLogsResponseItem} from 'sentry/views/explore/logs/types';
 
 function disableMacros(value: string | null | boolean | number | undefined) {
@@ -35,17 +36,5 @@ export function downloadLogsAsCsv(
 
   const encodedDataUrl = `data:text/csv;charset=utf8,${encodeURIComponent(csvContent)}`;
 
-  const now = new Date();
-  emptyClickCSV(encodedDataUrl, filename, now);
-}
-
-function emptyClickCSV(encodedDataUrl: string, filename: string, now: Date) {
-  const link = document.createElement('a');
-
-  link.setAttribute('href', encodedDataUrl);
-  link.setAttribute('download', `${filename} ${getUtcDateString(now)}.csv`);
-  link.click();
-  link.remove();
-
-  return encodedDataUrl;
+  downloadFromHref(createLogDownloadFilename(filename, 'csv'), encodedDataUrl);
 }
diff --git a/static/app/views/explore/logs/downloadLogsAsJson.ts b/static/app/views/explore/logs/downloadLogsAsJson.ts
new file mode 100644
index 00000000000000..ddbb5c3b4d64e9
--- /dev/null
+++ b/static/app/views/explore/logs/downloadLogsAsJson.ts
@@ -0,0 +1,10 @@
+import {downloadFromHref} from 'sentry/utils/downloadFromHref';
+import {createLogDownloadFilename} from 'sentry/views/explore/logs/createLogDownloadFilename';
+import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
+
+export function downloadLogsAsJson(tableData: OurLogsResponseItem[], filename: string) {
+  const jsonContent = JSON.stringify(tableData);
+  const encodedDataUrl = `data:application/json;charset=utf8,${encodeURIComponent(jsonContent)}`;
+
+  downloadFromHref(createLogDownloadFilename(filename, 'json'), encodedDataUrl);
+}
diff --git a/static/app/views/explore/logs/logsExport.spec.tsx b/static/app/views/explore/logs/logsExport.spec.tsx
deleted file mode 100644
index cd9d21349b4c1f..00000000000000
--- a/static/app/views/explore/logs/logsExport.spec.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import {initializeLogsTest} from 'sentry-fixture/log';
-
-import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
-
-import {LogsAnalyticsPageSource} from 'sentry/utils/analytics/logsAnalyticsEvent';
-import {LOGS_QUERY_KEY} from 'sentry/views/explore/contexts/logs/logsPageParams';
-import {LOGS_SORT_BYS_KEY} from 'sentry/views/explore/contexts/logs/sortBys';
-import {QUERY_PAGE_LIMIT} from 'sentry/views/explore/logs/constants';
-import {LogsExportButton} from 'sentry/views/explore/logs/logsExport';
-import {LogsQueryParamsProvider} from 'sentry/views/explore/logs/logsQueryParamsProvider';
-import {OurLogKnownFieldKey} from 'sentry/views/explore/logs/types';
-
-jest.mock('sentry/views/explore/logs/logsExportCsv');
-
-describe('LogsExportButton', () => {
-  const {organization, setupPageFilters} = initializeLogsTest({
-    organization: {features: ['ourlogs-enabled', 'discover-query']},
-  });
-  const initialRouterConfig = {
-    location: {
-      pathname: `/organizations/${organization.slug}/explore/logs/`,
-      query: {
-        [LOGS_SORT_BYS_KEY]: '-timestamp',
-        [LOGS_QUERY_KEY]: 'severity:error level:warning',
-      },
-    },
-    route: '/organizations/:orgId/explore/logs/',
-  };
-
-  function ProviderWrapper({children}: {children: React.ReactNode}) {
-    return (
-      <LogsQueryParamsProvider
-        analyticsPageSource={LogsAnalyticsPageSource.EXPLORE_LOGS}
-        source="location"
-      >
-        {children}
-      </LogsQueryParamsProvider>
-    );
-  }
-
-  const mockTableData = [
-    {
-      [OurLogKnownFieldKey.ID]: '019621262d117e03bce898cb8f4f6ff7',
-      [OurLogKnownFieldKey.PROJECT_ID]: '1',
-      [OurLogKnownFieldKey.ORGANIZATION_ID]: 1,
-      [OurLogKnownFieldKey.TRACE_ID]: '17cc0bae407042eaa4bf6d798c37d026',
-      [OurLogKnownFieldKey.SEVERITY_NUMBER]: 9,
-      [OurLogKnownFieldKey.SEVERITY]: 'info',
-      [OurLogKnownFieldKey.TIMESTAMP]: '2025-04-10T19:21:12+00:00',
-      [OurLogKnownFieldKey.MESSAGE]: 'some log message1',
-      [OurLogKnownFieldKey.TIMESTAMP_PRECISE]: 1.7443128722090732e18,
-      [OurLogKnownFieldKey.OBSERVED_TIMESTAMP_PRECISE]: 1.7443128722090732e18,
-    },
-    {
-      [OurLogKnownFieldKey.ID]: '0196212624a17144aa392d01420256a2',
-      [OurLogKnownFieldKey.PROJECT_ID]: '1',
-      [OurLogKnownFieldKey.ORGANIZATION_ID]: 1,
-      [OurLogKnownFieldKey.TRACE_ID]: 'c331c2df93d846f5a2134203416d40bb',
-      [OurLogKnownFieldKey.SEVERITY_NUMBER]: 9,
-      [OurLogKnownFieldKey.SEVERITY]: 'info',
-      [OurLogKnownFieldKey.TIMESTAMP]: '2025-04-10T19:21:10+00:00',
-      [OurLogKnownFieldKey.MESSAGE]: 'some log message2',
-      [OurLogKnownFieldKey.TIMESTAMP_PRECISE]: 1.744312870049196e18,
-      [OurLogKnownFieldKey.OBSERVED_TIMESTAMP_PRECISE]: 1.744312870049196e18,
-    },
-  ];
-
-  beforeEach(() => {
-    MockApiClient.clearMockResponses();
-    setupPageFilters();
-  });
-
-  it('should render browser export button for small datasets', () => {
-    render(
-      <ProviderWrapper>
-        <LogsExportButton isLoading={false} tableData={mockTableData} error={null} />
-      </ProviderWrapper>,
-      {initialRouterConfig, organization}
-    );
-
-    expect(screen.getByTestId('export-download-csv')).toBeInTheDocument();
-    expect(screen.getByRole('button', {name: 'Export'})).toBeInTheDocument();
-  });
-
-  it('should send correct payload for async export with all LogsQueryInfo parameters', async () => {
-    const largeTableData = new Array(QUERY_PAGE_LIMIT).fill(mockTableData[0]);
-
-    const exportMock = MockApiClient.addMockResponse({
-      url: `/organizations/${organization.slug}/data-export/`,
-      method: 'POST',
-      body: {id: 721},
-    });
-
-    render(
-      <ProviderWrapper>
-        <LogsExportButton isLoading={false} tableData={largeTableData} error={null} />
-      </ProviderWrapper>,
-      {initialRouterConfig, organization}
-    );
-
-    await userEvent.click(screen.getByRole('button', {name: 'Export'}));
-
-    expect(exportMock).toHaveBeenCalledWith('/organizations/org-slug/data-export/', {
-      data: {
-        query_info: {
-          dataset: 'logs',
-          end: undefined,
-          environment: [],
-          field: ['timestamp', 'message'],
-          project: [2],
-          query: 'severity:error level:warning',
-          sort: ['-timestamp'],
-          start: undefined,
-          statsPeriod: '14d',
-        },
-        query_type: 'Explore',
-      },
-      error: expect.any(Function),
-      method: 'POST',
-      success: expect.any(Function),
-    });
-  });
-
-  it('should handle CSV export for small datasets', async () => {
-    const mockDownloadLogsAsCsv = jest.mocked(
-      require('sentry/views/explore/logs/logsExportCsv').downloadLogsAsCsv
-    );
-
-    render(
-      <ProviderWrapper>
-        <LogsExportButton isLoading={false} tableData={mockTableData} error={null} />
-      </ProviderWrapper>,
-      {initialRouterConfig, organization}
-    );
-
-    await userEvent.click(screen.getByTestId('export-download-csv'));
-
-    expect(mockDownloadLogsAsCsv).toHaveBeenCalledWith(
-      mockTableData,
-      ['timestamp', 'message'],
-      'logs'
-    );
-  });
-
-  it('should disable button when loading', () => {
-    render(
-      <ProviderWrapper>
-        <LogsExportButton isLoading tableData={mockTableData} error={null} />
-      </ProviderWrapper>,
-      {initialRouterConfig, organization}
-    );
-
-    expect(screen.getByRole('button', {name: 'Export'})).toBeDisabled();
-  });
-
-  it('should disable button when there is an error', () => {
-    render(
-      <ProviderWrapper>
-        <LogsExportButton
-          isLoading={false}
-          tableData={mockTableData}
-          error={new Error('Test error')}
-        />
-      </ProviderWrapper>,
-      {initialRouterConfig, organization}
-    );
-
-    expect(screen.getByRole('button', {name: 'Export'})).toBeDisabled();
-  });
-
-  it('should disable button when table data is empty', () => {
-    render(
-      <ProviderWrapper>
-        <LogsExportButton isLoading={false} tableData={[]} error={null} />
-      </ProviderWrapper>,
-      {initialRouterConfig, organization}
-    );
-
-    expect(screen.getByRole('button', {name: 'Export'})).toBeDisabled();
-  });
-});
diff --git a/static/app/views/explore/logs/logsExport.tsx b/static/app/views/explore/logs/logsExport.tsx
deleted file mode 100644
index f02ee7f05c70ec..00000000000000
--- a/static/app/views/explore/logs/logsExport.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
-import {ExploreExport} from 'sentry/views/explore/components/exploreExport';
-import {QUERY_PAGE_LIMIT} from 'sentry/views/explore/logs/constants';
-import {downloadLogsAsCsv} from 'sentry/views/explore/logs/logsExportCsv';
-import type {OurLogFieldKey, OurLogsResponseItem} from 'sentry/views/explore/logs/types';
-import {
-  useQueryParamsFields,
-  useQueryParamsSearch,
-  useQueryParamsSortBys,
-} from 'sentry/views/explore/queryParams/context';
-import {TraceItemDataset} from 'sentry/views/explore/types';
-
-type LogsExportButtonProps = {
-  isLoading: boolean;
-  tableData: OurLogsResponseItem[] | null | undefined;
-  error?: Error | null;
-};
-
-interface LogsQueryInfo {
-  dataset: 'logs';
-  field: OurLogFieldKey[];
-  project: number[];
-  query: string;
-  sort: string[];
-  end?: string;
-  environment?: string[];
-  start?: string;
-  statsPeriod?: string;
-}
-
-export function LogsExportButton(props: LogsExportButtonProps) {
-  const {selection} = usePageFilters();
-  const logsSearch = useQueryParamsSearch();
-  const fields = useQueryParamsFields();
-  const sortBys = useQueryParamsSortBys();
-  const {start, end, period: statsPeriod} = selection.datetime;
-  const {environments, projects} = selection;
-
-  const queryInfo: LogsQueryInfo = {
-    dataset: 'logs',
-    field: [...fields],
-    query: logsSearch.formatString(),
-    project: projects,
-    sort: sortBys.map(sort => `${sort.kind === 'desc' ? '-' : ''}${sort.field}`),
-    start: start ? new Date(start).toISOString() : undefined,
-    end: end ? new Date(end).toISOString() : undefined,
-    statsPeriod: statsPeriod || undefined,
-    environment: environments,
-  };
-
-  const isMoreThanOnePage =
-    props.tableData && props.tableData.length > QUERY_PAGE_LIMIT - 1;
-
-  const disabled =
-    props.isLoading ||
-    props.error !== null ||
-    !props.tableData ||
-    props.tableData.length === 0;
-
-  const isDataEmpty = !props.tableData || props.tableData.length === 0;
-  const isDataLoading = props.isLoading;
-  const isDataError = props.error !== null;
-
-  const handleDownloadAsCsv = () => {
-    if (props.tableData) {
-      downloadLogsAsCsv(props.tableData, queryInfo.field, 'logs');
-    }
-  };
-
-  return (
-    <ExploreExport
-      traceItemDataset={TraceItemDataset.LOGS}
-      disabled={disabled}
-      hasReachedCSVLimit={!!isMoreThanOnePage}
-      queryInfo={queryInfo}
-      isDataEmpty={isDataEmpty}
-      isDataLoading={isDataLoading}
-      isDataError={isDataError}
-      downloadAsCsv={handleDownloadAsCsv}
-    />
-  );
-}
diff --git a/static/app/views/explore/logs/logsExportButton.tsx b/static/app/views/explore/logs/logsExportButton.tsx
new file mode 100644
index 00000000000000..e05c2f98949ebb
--- /dev/null
+++ b/static/app/views/explore/logs/logsExportButton.tsx
@@ -0,0 +1,46 @@
+import {type LogsQueryInfo} from 'sentry/components/useDataExport';
+import {ExploreExport} from 'sentry/views/explore/components/exploreExport';
+import {QUERY_PAGE_LIMIT} from 'sentry/views/explore/logs/constants';
+import {downloadLogsAsCsv} from 'sentry/views/explore/logs/downloadLogsAsCsv';
+import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
+import {TraceItemDataset} from 'sentry/views/explore/types';
+
+type LogsExportButtonProps = {
+  isLoading: boolean;
+  queryInfo: LogsQueryInfo;
+  tableData: OurLogsResponseItem[] | null | undefined;
+  /** Passed through from LogsExportSwitch for the modal path only */
+  downloadLocally?: boolean;
+  error?: Error | null;
+  threshold?: number;
+};
+
+export function LogsExportButton({
+  isLoading,
+  tableData,
+  error,
+  queryInfo,
+}: LogsExportButtonProps) {
+  const isDataEmpty = !tableData?.length;
+  const isDataError = error !== null;
+
+  const handleDownloadAsCsv = () => {
+    if (tableData) {
+      downloadLogsAsCsv(tableData, queryInfo.field, 'logs');
+    }
+  };
+
+  const isMoreThanOnePage = !!tableData && tableData.length > QUERY_PAGE_LIMIT - 1;
+
+  return (
+    <ExploreExport
+      traceItemDataset={TraceItemDataset.LOGS}
+      hasReachedCSVLimit={isMoreThanOnePage}
+      queryInfo={queryInfo}
+      isDataEmpty={isDataEmpty}
+      isDataLoading={isLoading}
+      isDataError={isDataError}
+      downloadAsCsv={handleDownloadAsCsv}
+    />
+  );
+}
diff --git a/static/app/views/explore/logs/logsExportModal.tsx b/static/app/views/explore/logs/logsExportModal.tsx
new file mode 100644
index 00000000000000..ce747a614ffc11
--- /dev/null
+++ b/static/app/views/explore/logs/logsExportModal.tsx
@@ -0,0 +1,185 @@
+import {useMemo} from 'react';
+import {z} from 'zod';
+
+import {Button} from '@sentry/scraps/button';
+import {defaultFormOptions, useScrapsForm} from '@sentry/scraps/form';
+import {Flex, Stack} from '@sentry/scraps/layout';
+import {Heading, Text} from '@sentry/scraps/text';
+
+import {addSuccessMessage} from 'sentry/actionCreators/indicator';
+import type {ModalRenderProps} from 'sentry/actionCreators/modal';
+import {
+  ExportQueryType,
+  useDataExport,
+  type LogsQueryInfo,
+} from 'sentry/components/useDataExport';
+import {t} from 'sentry/locale';
+import {downloadFromHref} from 'sentry/utils/downloadFromHref';
+import {QUERY_PAGE_LIMIT} from 'sentry/views/explore/logs/constants';
+import {createLogDownloadFilename} from 'sentry/views/explore/logs/createLogDownloadFilename';
+import {downloadLogs} from 'sentry/views/explore/logs/downloadLogs';
+import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
+import {TraceItemDataset} from 'sentry/views/explore/types';
+
+const ROW_COUNT_VALUE_DEFAULT = 100;
+
+/**
+ * Keep this in sync with data_export.py on the backend
+ * (TODO: Saraj is looking into updating this)
+ */
+const ROW_COUNT_VALUE_SYNC_LIMIT = QUERY_PAGE_LIMIT;
+
+const ROW_COUNT_VALUES = [
+  ROW_COUNT_VALUE_DEFAULT,
+  500,
+  ROW_COUNT_VALUE_SYNC_LIMIT,
+  10_000,
+  50_000,
+  100_000,
+] as const;
+
+const exportModalFormSchema = z.object({
+  allColumns: z.boolean(),
+  format: z.enum(['csv', 'json']),
+  limit: z.union(ROW_COUNT_VALUES.map(option => z.literal(option))),
+});
+
+type ExportModalFormValues = z.infer<typeof exportModalFormSchema>;
+
+const defaultExportModalValues: ExportModalFormValues = {
+  allColumns: false,
+  format: 'csv',
+  limit: 100,
+};
+
+type LogsExportModalProps = ModalRenderProps & {
+  downloadLocally: boolean;
+  queryInfo: LogsQueryInfo;
+  tableData: OurLogsResponseItem[];
+  threshold: number;
+};
+
+export function LogsExportModal({
+  Body,
+  Footer,
+  Header,
+  closeModal,
+  queryInfo,
+  tableData,
+}: LogsExportModalProps) {
+  const payload = useMemo(
+    () => ({
+      queryType: ExportQueryType.EXPLORE,
+      queryInfo: {
+        ...queryInfo,
+        dataset: TraceItemDataset.LOGS,
+      },
+    }),
+    [queryInfo]
+  );
+  const {mutation} = useDataExport({payload});
+  const rowOptions = ROW_COUNT_VALUES.map(value => ({label: value, value}));
+  const rowOptionsAvailable =
+    tableData.length < QUERY_PAGE_LIMIT
+      ? rowOptions.filter(({value}) => value <= tableData.length)
+      : rowOptions;
+
+  const form = useScrapsForm({
+    ...defaultFormOptions,
+    defaultValues: defaultExportModalValues,
+    validators: {
+      onDynamic: exportModalFormSchema,
+    },
+    onSubmit: async ({value}) => {
+      if (!value.allColumns && value.limit < ROW_COUNT_VALUE_SYNC_LIMIT) {
+        downloadLogs({
+          tableData,
+          fields: queryInfo.field,
+          filename: 'logs',
+          format: value.format,
+          limit: value.limit,
+        });
+        addSuccessMessage(t('Downloading file to your browser.'));
+        return;
+      }
+
+      // TODO: How should we type this?
+      const {data} = (await mutation.mutateAsync(value)) as {
+        data: {fileName: string | null; id: string};
+      };
+      if (data.fileName) {
+        const filename = createLogDownloadFilename(data.fileName, value.format);
+        downloadFromHref(
+          filename,
+          `/api/0/organizations/sentry/data-export/${data.id}/?download=true`
+        );
+        addSuccessMessage(t("Downloading '%s' to your browser.", filename));
+      }
+    },
+  });
+
+  return (
+    <form.AppForm form={form}>
+      <Header closeButton>
+        <Heading as="h2">{t('Logs Export')}</Heading>
+      </Header>
+      <Body>
+        <Stack gap="lg">
+          <Text>
+            {t(
+              'If you select more than %s rows or to export all columns of data your file will be sent to your email address.',
+              ROW_COUNT_VALUE_SYNC_LIMIT
+            )}
+          </Text>
+          <form.AppField name="format">
+            {field => (
+              <field.Radio.Group
+                value={field.state.value}
+                onChange={value =>
+                  field.handleChange(value as ExportModalFormValues['format'])
+                }
+              >
+                <field.Layout.Stack label={t('Format')}>
+                  <field.Radio.Item value="csv">{t('CSV')}</field.Radio.Item>
+                  <field.Radio.Item value="json">{t('JSON')}</field.Radio.Item>
+                </field.Layout.Stack>
+              </field.Radio.Group>
+            )}
+          </form.AppField>
+          <form.AppField name="limit">
+            {field => (
+              <field.Layout.Stack label={t('Number of rows')}>
+                <field.Select
+                  disabled={rowOptionsAvailable.length === 1}
+                  options={rowOptionsAvailable}
+                  onChange={field.handleChange}
+                  value={field.state.value}
+                  // @ts-expect-error -- TODO: scraps & union-of-literal selects?
+                  defaultValue={rowOptionsAvailable[0].value}
+                />
+              </field.Layout.Stack>
+            )}
+          </form.AppField>
+          <form.AppField name="allColumns">
+            {field => (
+              <field.Layout.Stack label={t('All columns')}>
+                <field.Switch
+                  checked={field.state.value ?? false}
+                  onChange={field.handleChange}
+                />
+              </field.Layout.Stack>
+            )}
+          </form.AppField>
+        </Stack>
+      </Body>
+      <Footer>
+        <Flex gap="xl" justify="end">
+          <Button priority="default" onClick={closeModal}>
+            {t('Cancel')}
+          </Button>
+          <form.SubmitButton priority="primary">{t('Export')}</form.SubmitButton>
+        </Flex>
+      </Footer>
+    </form.AppForm>
+  );
+}
diff --git a/static/app/views/explore/logs/logsExportModalButton.tsx b/static/app/views/explore/logs/logsExportModalButton.tsx
new file mode 100644
index 00000000000000..2c05329404b86d
--- /dev/null
+++ b/static/app/views/explore/logs/logsExportModalButton.tsx
@@ -0,0 +1,56 @@
+import {Button} from '@sentry/scraps/button';
+
+import {openModal} from 'sentry/actionCreators/modal';
+import {type LogsQueryInfo} from 'sentry/components/useDataExport';
+import {IconDownload} from 'sentry/icons';
+import {t} from 'sentry/locale';
+import {getExportDisabledTooltip} from 'sentry/views/explore/components/getExportDisabledTooltip';
+import {LogsExportModal} from 'sentry/views/explore/logs/logsExportModal';
+import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
+
+type LogsExportModalButtonProps = {
+  downloadLocally: boolean;
+  isLoading: boolean;
+  queryInfo: LogsQueryInfo;
+  tableData: OurLogsResponseItem[] | null | undefined;
+  threshold: number;
+  error?: Error | null;
+};
+
+export function LogsExportModalButton(props: LogsExportModalButtonProps) {
+  const {isLoading, tableData, error, queryInfo, downloadLocally, threshold} = props;
+  const isDataEmpty = !tableData?.length;
+  const isDataError = error !== null;
+
+  const disabledTooltip = getExportDisabledTooltip({
+    isDataEmpty,
+    isDataError,
+    isDataLoading: isLoading,
+  });
+
+  return (
+    <Button
+      disabled={!!disabledTooltip}
+      size="xs"
+      priority="default"
+      icon={<IconDownload />}
+      onClick={() => {
+        openModal(deps => (
+          <LogsExportModal
+            {...deps}
+            queryInfo={queryInfo}
+            tableData={tableData}
+            downloadLocally={downloadLocally}
+            threshold={threshold}
+          />
+        ));
+      }}
+      tooltipProps={{
+        title:
+          disabledTooltip ?? t('Configure export options before starting your export.'),
+      }}
+    >
+      {t('Export Data')}
+    </Button>
+  );
+}
diff --git a/static/app/views/explore/logs/logsExportSwitch.tsx b/static/app/views/explore/logs/logsExportSwitch.tsx
new file mode 100644
index 00000000000000..31399a864efe76
--- /dev/null
+++ b/static/app/views/explore/logs/logsExportSwitch.tsx
@@ -0,0 +1,66 @@
+import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
+import {type LogsQueryInfo} from 'sentry/components/useDataExport';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useOrganization} from 'sentry/utils/useOrganization';
+import {LogsExportButton} from 'sentry/views/explore/logs/logsExportButton';
+import {LogsExportModalButton} from 'sentry/views/explore/logs/logsExportModalButton';
+import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
+import {
+  useQueryParamsFields,
+  useQueryParamsSearch,
+  useQueryParamsSortBys,
+} from 'sentry/views/explore/queryParams/context';
+
+type LogsExportSwitchProps = {
+  downloadLocally: boolean;
+  isLoading: boolean;
+  tableData: OurLogsResponseItem[] | null | undefined;
+  threshold: number;
+  error?: Error | null;
+};
+
+export function LogsExportSwitch({
+  isLoading,
+  tableData,
+  error,
+  downloadLocally,
+  threshold,
+}: LogsExportSwitchProps) {
+  const organization = useOrganization();
+  const location = useLocation();
+  const showModalExport =
+    organization.features.includes('ourlogs-modal-export') ||
+    location.query.logsModalExport === 'true';
+
+  const {selection} = usePageFilters();
+  const logsSearch = useQueryParamsSearch();
+  const fields = useQueryParamsFields();
+  const sortBys = useQueryParamsSortBys();
+  const {start, end, period: statsPeriod} = selection.datetime;
+  const {environments, projects} = selection;
+
+  const queryInfo: LogsQueryInfo = {
+    dataset: 'logs',
+    field: [...fields],
+    query: logsSearch.formatString(),
+    project: projects,
+    sort: sortBys.map(sort => `${sort.kind === 'desc' ? '-' : ''}${sort.field}`),
+    start: start ? new Date(start).toISOString() : undefined,
+    end: end ? new Date(end).toISOString() : undefined,
+    statsPeriod: statsPeriod || undefined,
+    environment: environments,
+  };
+
+  const ButtonComponent = showModalExport ? LogsExportModalButton : LogsExportButton;
+
+  return (
+    <ButtonComponent
+      queryInfo={queryInfo}
+      isLoading={isLoading}
+      error={error}
+      tableData={tableData}
+      downloadLocally={downloadLocally}
+      threshold={threshold}
+    />
+  );
+}
diff --git a/static/app/views/explore/logs/logsTab.tsx b/static/app/views/explore/logs/logsTab.tsx
index a2c10489ad57c0..d1a46d21be278f 100644
--- a/static/app/views/explore/logs/logsTab.tsx
+++ b/static/app/views/explore/logs/logsTab.tsx
@@ -52,10 +52,12 @@ import {useLogAnalytics} from 'sentry/views/explore/hooks/useAnalytics';
 import {
   HiddenColumnEditorLogFields,
   HiddenLogSearchFields,
+  QUERY_PAGE_LIMIT,
+  QUERY_PAGE_LIMIT_WITH_AUTO_REFRESH,
 } from 'sentry/views/explore/logs/constants';
 import {AutorefreshToggle} from 'sentry/views/explore/logs/logsAutoRefresh';
 import {LogsDownSamplingAlert} from 'sentry/views/explore/logs/logsDownsamplingAlert';
-import {LogsExportButton} from 'sentry/views/explore/logs/logsExport';
+import {LogsExportSwitch} from 'sentry/views/explore/logs/logsExportSwitch';
 import {LogsGraph} from 'sentry/views/explore/logs/logsGraph';
 import {LogsTabSeerComboBox} from 'sentry/views/explore/logs/logsTabSeerComboBox';
 import {LogsToolbar} from 'sentry/views/explore/logs/logsToolbar';
@@ -253,6 +255,10 @@ export function LogsTabContent({datePageFilterProps, tableExpando}: LogsTabProps
   const setFields = useSetQueryParamsFields();
   const tableData = useLogsPageDataQueryResult();
   const autorefreshEnabled = useLogsAutoRefreshEnabled();
+  const logsExportThreshold = autorefreshEnabled
+    ? QUERY_PAGE_LIMIT_WITH_AUTO_REFRESH
+    : QUERY_PAGE_LIMIT;
+  const logsExportDownloadLocally = !tableData.isPending && !tableData.hasNextPage;
 
   const [timeseriesIngestDelay, setTimeseriesIngestDelay] = useState<bigint>(
     getMaxIngestDelayTimestamp()
@@ -455,10 +461,12 @@ export function LogsTabContent({datePageFilterProps, tableExpando}: LogsTabProps
               >
                 {sidebarOpen ? null : t('Advanced')}
               </LogsSidebarCollapseButton>
-              <LogsExportButton
+              <LogsExportSwitch
                 isLoading={tableData.isPending}
                 tableData={tableData.data}
                 error={tableData.error}
+                downloadLocally={logsExportDownloadLocally}
+                threshold={logsExportThreshold}
               />
             </OverChartButtonGroup>
           )}