diff --git a/src/applications/mhv-medical-records/actions/blueButtonReport.js b/src/applications/mhv-medical-records/actions/blueButtonReport.js
index 2f9822efa9a0..09320b333d4a 100644
--- a/src/applications/mhv-medical-records/actions/blueButtonReport.js
+++ b/src/applications/mhv-medical-records/actions/blueButtonReport.js
@@ -16,64 +16,86 @@ import { Actions } from '../util/actionTypes';
 import * as Constants from '../util/constants';
 import { addAlert } from './alerts';
 
-export const getBlueButtonReportData = () => async dispatch => {
+export const getBlueButtonReportData = (options = {}) => async dispatch => {
   try {
-    const [
-      labs,
-      notes,
-      vaccines,
-      allergies,
-      conditions,
-      vitals,
-      radiology,
-      medications,
-      appointments,
-      demographics,
-      militaryService,
-      patient,
-    ] = await Promise.all([
-      getLabsAndTests(),
-      getNotes(),
-      getVaccineList(),
-      getAllergies(),
-      getConditions(),
-      getVitalsList(),
-      getMhvRadiologyTests(),
-      getMedications(),
-      getAppointments(),
-      getDemographicInfo(),
-      getMilitaryService(),
-      getPatient(),
-    ]);
-    dispatch({
-      type: Actions.LabsAndTests.GET_LIST,
-      labsAndTestsResponse: labs,
-      radiologyResponse: radiology,
-    });
-    dispatch({
-      type: Actions.CareSummariesAndNotes.GET_LIST,
-      response: notes,
-    });
-    dispatch({
-      type: Actions.Vaccines.GET_LIST,
-      response: vaccines,
-    });
-    dispatch({
-      type: Actions.Allergies.GET_LIST,
-      response: allergies,
-    });
-    dispatch({
-      type: Actions.Conditions.GET_LIST,
-      response: conditions,
-    });
-    dispatch({ type: Actions.Vitals.GET_LIST, response: vitals });
-    dispatch({
-      type: Actions.BlueButtonReport.GET,
-      medicationsResponse: medications,
-      appointmentsResponse: appointments,
-      demographicsResponse: demographics,
-      militaryServiceResponse: militaryService,
-      patientResponse: patient,
+    const fetchMap = {
+      labs: getLabsAndTests,
+      notes: getNotes,
+      vaccines: getVaccineList,
+      allergies: getAllergies,
+      conditions: getConditions,
+      vitals: getVitalsList,
+      radiology: getMhvRadiologyTests,
+      medications: getMedications,
+      appointments: getAppointments,
+      demographics: getDemographicInfo,
+      militaryService: getMilitaryService,
+      patient: getPatient,
+    };
+
+    const promises = Object.entries(fetchMap)
+      .filter(([key]) => options[key]) // Only include enabled fetches
+      .map(([key, fetchFn]) => fetchFn().then(response => ({ key, response })));
+
+    const results = await Promise.all(promises);
+
+    results.forEach(({ key, response }) => {
+      switch (key) {
+        case 'labs':
+          dispatch({
+            type: Actions.LabsAndTests.GET_LIST,
+            labsAndTestsResponse: response,
+          });
+          break;
+        case 'notes':
+          dispatch({
+            type: Actions.CareSummariesAndNotes.GET_LIST,
+            response,
+          });
+          break;
+        case 'vaccines':
+          dispatch({
+            type: Actions.Vaccines.GET_LIST,
+            response,
+          });
+          break;
+        case 'allergies':
+          dispatch({
+            type: Actions.Allergies.GET_LIST,
+            response,
+          });
+          break;
+        case 'conditions':
+          dispatch({
+            type: Actions.Conditions.GET_LIST,
+            response,
+          });
+          break;
+        case 'vitals':
+          dispatch({
+            type: Actions.Vitals.GET_LIST,
+            response,
+          });
+          break;
+        case 'radiology':
+          dispatch({
+            type: Actions.LabsAndTests.GET_LIST,
+            radiologyResponse: response,
+          });
+          break;
+        case 'medications':
+        case 'appointments':
+        case 'demographics':
+        case 'militaryService':
+        case 'patient':
+          dispatch({
+            type: Actions.BlueButtonReport.GET,
+            [`${key}Response`]: response,
+          });
+          break;
+        default:
+          break;
+      }
     });
   } catch (error) {
     dispatch(addAlert(Constants.ALERT_TYPE_ERROR, error));
diff --git a/src/applications/mhv-medical-records/components/DownloadRecords/DownloadFileType.jsx b/src/applications/mhv-medical-records/components/DownloadRecords/DownloadFileType.jsx
index 58a47c85e5fd..9786ed9fa9c3 100644
--- a/src/applications/mhv-medical-records/components/DownloadRecords/DownloadFileType.jsx
+++ b/src/applications/mhv-medical-records/components/DownloadRecords/DownloadFileType.jsx
@@ -31,8 +31,6 @@ const DownloadFileType = props => {
   const user = useSelector(state => state.user.profile);
   const name = formatName(user.userFullName);
   const dob = formatDateLong(user.dob);
-  const [blueButtonRequested, setBlueButtonRequested] = useState(false);
-  const [downloadType, setDownloadType] = useState('');
 
   const labsAndTests = useSelector(
     state => state.mr.labsAndTests.labsAndTestsList,
@@ -61,22 +59,16 @@ const DownloadFileType = props => {
 
   const [downloadStarted, setDownloadStarted] = useState(false);
 
-  const allAreDefined = arrayOfArrays => {
-    return arrayOfArrays.every(
-      data =>
-        (typeof data === 'object' && Object.keys(data)?.length) ||
-        (typeof data === 'string' && data?.length) ||
-        (Array.isArray(data) && !!data?.length),
-    );
-  };
-
-  useEffect(() => {
-    if (!dateFilter) {
-      history.push('/download/date-range');
-    } else if (!recordFilter) {
-      history.push('/download/record-type');
-    }
-  });
+  useEffect(
+    () => {
+      if (!dateFilter) {
+        history.push('/download/date-range');
+      } else if (!recordFilter) {
+        history.push('/download/record-type');
+      }
+    },
+    [dateFilter, history, recordFilter],
+  );
 
   const [filterFromDate, filterToDate] = useMemo(
     () => {
@@ -85,109 +77,170 @@ const DownloadFileType = props => {
     [dateFilter],
   );
 
-  const filterByDate = recDate => {
-    return (
-      isBefore(new Date(filterFromDate), new Date(recDate)) &&
-      isAfter(new Date(filterToDate), new Date(recDate))
-    );
-  };
-
-  const recordData = useMemo(() => {
-    if (
-      !allAreDefined([
-        labsAndTests,
-        notes,
+  /**
+   * True if all the records that were specified in the filters have been fetched, otherwise false.
+   */
+  const isDataFetched = useMemo(
+    () => {
+      // Map the recordFilter keys to the corresponding data domains
+      const dataMap = {
+        labTests: labsAndTests,
+        careSummaries: notes,
         vaccines,
         allergies,
         conditions,
         vitals,
-      ])
-    ) {
-      dispatch(getBlueButtonReportData());
-    } else {
-      return {
-        labsAndTests: recordFilter?.includes('labTests')
-          ? labsAndTests.filter(rec => filterByDate(rec.sortDate))
-          : null,
-        notes: recordFilter?.includes('careSummaries')
-          ? notes.filter(rec => filterByDate(rec.sortByDate))
-          : null,
-        vaccines: recordFilter?.includes('vaccines')
-          ? vaccines.filter(rec => filterByDate(rec.date))
-          : null,
+        medications,
+        upcomingAppts: appointments,
+        pastAppts: appointments,
+        demographics,
+        militaryService,
+        accountSummary,
+      };
+
+      // Check if all domains in the recordFilter are truthy
+      return recordFilter?.every(filter => !!dataMap[filter]);
+    },
+    [
+      labsAndTests,
+      notes,
+      vaccines,
+      allergies,
+      conditions,
+      vitals,
+      medications,
+      appointments,
+      demographics,
+      militaryService,
+      accountSummary,
+      recordFilter,
+    ],
+  );
+
+  useEffect(
+    () => {
+      const options = {
+        labs: recordFilter?.includes('labTests'),
+        notes: recordFilter?.includes('careSummaries'),
+        vaccines: recordFilter?.includes('vaccines'),
         allergies:
           recordFilter?.includes('allergies') ||
-          recordFilter?.includes('medications')
-            ? allergies
-            : null,
-        conditions: recordFilter?.includes('conditions') ? conditions : null,
-        vitals: recordFilter?.includes('vitals')
-          ? vitals.filter(rec => filterByDate(rec.date))
-          : null,
-        medications: recordFilter?.includes('medications')
-          ? medications.filter(rec => filterByDate(rec.lastFilledOn))
-          : null,
+          recordFilter?.includes('medications'),
+        conditions: recordFilter?.includes('conditions'),
+        vitals: recordFilter?.includes('vitals'),
+        medications: recordFilter?.includes('medications'),
         appointments:
           recordFilter?.includes('upcomingAppts') ||
-          recordFilter?.includes('pastAppts')
-            ? appointments.filter(
-                rec =>
-                  filterByDate(rec.date) &&
-                  ((recordFilter.includes('upcomingAppts') && rec.isUpcoming) ||
-                    (recordFilter.includes('pastAppts') && !rec.isUpcoming)),
-              )
-            : null,
-        demographics: recordFilter?.includes('demographics')
-          ? demographics
-          : null,
-        militaryService: recordFilter?.includes('militaryService')
-          ? militaryService
-          : null,
-        accountSummary,
+          recordFilter?.includes('pastAppts'),
+        demographics: recordFilter?.includes('demographics'),
+        militaryService: recordFilter?.includes('militaryService'),
       };
-    }
-    return {};
-  });
 
-  const recordCount = useMemo(() => {
-    let count = 0;
-    count += recordData?.labsAndTests ? recordData?.labsAndTests?.length : 0;
-    count += recordData?.notes ? recordData?.notes?.length : 0;
-    count += recordData?.vaccines ? recordData?.vaccines?.length : 0;
-    count += recordData?.allergies ? recordData?.allergies?.length : 0;
-    count += recordData?.conditions ? recordData?.conditions?.length : 0;
-    count += recordData?.vitals ? recordData?.vitals?.length : 0;
-    count += recordData?.medications ? recordData?.medications?.length : 0;
-    count += recordData?.appointments ? recordData?.appointments?.length : 0;
-    count += recordData?.demographics ? 1 : 0;
-    count += recordData?.militaryService ? 1 : 0;
+      if (!isDataFetched) {
+        dispatch(getBlueButtonReportData(options));
+      }
+    },
+    [isDataFetched, recordFilter, dispatch],
+  );
+
+  const recordData = useMemo(
+    () => {
+      const filterByDate = recDate => {
+        return (
+          isBefore(new Date(filterFromDate), new Date(recDate)) &&
+          isAfter(new Date(filterToDate), new Date(recDate))
+        );
+      };
+
+      if (isDataFetched) {
+        return {
+          labsAndTests: recordFilter?.includes('labTests')
+            ? labsAndTests.filter(rec => filterByDate(rec.sortDate))
+            : null,
+          notes: recordFilter?.includes('careSummaries')
+            ? notes.filter(rec => filterByDate(rec.sortByDate))
+            : null,
+          vaccines: recordFilter?.includes('vaccines')
+            ? vaccines.filter(rec => filterByDate(rec.date))
+            : null,
+          allergies:
+            recordFilter?.includes('allergies') ||
+            recordFilter?.includes('medications')
+              ? allergies
+              : null,
+          conditions: recordFilter?.includes('conditions') ? conditions : null,
+          vitals: recordFilter?.includes('vitals')
+            ? vitals.filter(rec => filterByDate(rec.date))
+            : null,
+          medications: recordFilter?.includes('medications')
+            ? medications.filter(rec => filterByDate(rec.lastFilledOn))
+            : null,
+          appointments:
+            recordFilter?.includes('upcomingAppts') ||
+            recordFilter?.includes('pastAppts')
+              ? appointments.filter(
+                  rec =>
+                    filterByDate(rec.date) &&
+                    ((recordFilter.includes('upcomingAppts') &&
+                      rec.isUpcoming) ||
+                      (recordFilter.includes('pastAppts') && !rec.isUpcoming)),
+                )
+              : null,
+          demographics: recordFilter?.includes('demographics')
+            ? demographics
+            : null,
+          militaryService: recordFilter?.includes('militaryService')
+            ? militaryService
+            : null,
+          accountSummary,
+        };
+      }
+      return null;
+    },
+    [
+      isDataFetched,
+      filterFromDate,
+      filterToDate,
+      recordFilter,
+      labsAndTests,
+      notes,
+      vaccines,
+      allergies,
+      conditions,
+      vitals,
+      medications,
+      appointments,
+      demographics,
+      militaryService,
+      accountSummary,
+    ],
+  );
+
+  const recordCount = useMemo(
+    () => {
+      let count = 0;
+      count += recordData?.labsAndTests ? recordData?.labsAndTests?.length : 0;
+      count += recordData?.notes ? recordData?.notes?.length : 0;
+      count += recordData?.vaccines ? recordData?.vaccines?.length : 0;
+      count += recordData?.allergies ? recordData?.allergies?.length : 0;
+      count += recordData?.conditions ? recordData?.conditions?.length : 0;
+      count += recordData?.vitals ? recordData?.vitals?.length : 0;
+      count += recordData?.medications ? recordData?.medications?.length : 0;
+      count += recordData?.appointments ? recordData?.appointments?.length : 0;
+      count += recordData?.demographics ? 1 : 0;
+      count += recordData?.militaryService ? 1 : 0;
 
-    return count;
-  });
+      return count;
+    },
+    [recordData],
+  );
 
   const generatePdf = useCallback(
     async () => {
       setDownloadStarted(true);
-      setDownloadType('pdf');
-      setBlueButtonRequested(true);
       dispatch(clearAlerts());
-      const allDefd = allAreDefined([
-        labsAndTests,
-        notes,
-        vaccines,
-        allergies,
-        conditions,
-        vitals,
-        medications,
-        appointments,
-        demographics,
-        militaryService,
-        accountSummary,
-      ]);
-      if (!allDefd) {
-        dispatch(getBlueButtonReportData());
-      } else {
-        setBlueButtonRequested(false);
+
+      if (isDataFetched) {
         const title = 'Blue Button report';
         const subject = 'VA Medical Record';
         const scaffold = generatePdfScaffold(user, title, subject);
@@ -201,97 +254,21 @@ const DownloadFileType = props => {
         makePdf(pdfName, pdfData, title, runningUnitTest, 'blueButtonReport');
       }
     },
-    [
-      accountSummary,
-      allergies,
-      appointments,
-      conditions,
-      demographics,
-      dispatch,
-      dob,
-      labsAndTests,
-      medications,
-      militaryService,
-      name,
-      notes,
-      user,
-      vaccines,
-      vitals,
-    ],
+    [dispatch, dob, isDataFetched, name, recordData, runningUnitTest, user],
   );
 
-  /**
-   *  Generate text function
-   */
   const generateTxt = useCallback(
     async () => {
       setDownloadStarted(true);
-      setDownloadType('txt');
-      setBlueButtonRequested(true);
       dispatch(clearAlerts());
-      if (
-        !allAreDefined([
-          labsAndTests,
-          notes,
-          vaccines,
-          allergies,
-          conditions,
-          vitals,
-        ])
-      ) {
-        dispatch(getBlueButtonReportData());
-      } else {
-        setBlueButtonRequested(false);
+      if (isDataFetched) {
         const pdfName = `VA-Blue-Button-report-${getNameDateAndTime(user)}`;
         const content = getTxtContent(recordData, user);
 
         generateTextFile(content, pdfName, user);
       }
     },
-    [
-      allergies,
-      conditions,
-      dispatch,
-      labsAndTests,
-      notes,
-      user,
-      vaccines,
-      vitals,
-    ],
-  );
-
-  useEffect(
-    () => {
-      if (
-        allAreDefined([
-          labsAndTests,
-          notes,
-          vaccines,
-          allergies,
-          conditions,
-          vitals,
-        ]) &&
-        blueButtonRequested
-      ) {
-        if (downloadType === 'pdf') {
-          generatePdf();
-        } else {
-          generateTxt();
-        }
-      }
-    },
-    [
-      labsAndTests,
-      notes,
-      vaccines,
-      allergies,
-      conditions,
-      vitals,
-      generatePdf,
-      generateTxt,
-      downloadType,
-      blueButtonRequested,
-    ],
+    [dispatch, isDataFetched, recordData, user],
   );
 
   return (
@@ -332,6 +309,7 @@ const DownloadFileType = props => {
           </div>
         </button>
         <button
+          disabled={!isDataFetched}
           className="vads-u-margin-y--0p5"
           onClick={() => {
             if (fileType === 'pdf') {
diff --git a/src/applications/mhv-medical-records/reducers/blueButton.js b/src/applications/mhv-medical-records/reducers/blueButton.js
index 8924909543a6..980132d7a1db 100644
--- a/src/applications/mhv-medical-records/reducers/blueButton.js
+++ b/src/applications/mhv-medical-records/reducers/blueButton.js
@@ -316,24 +316,44 @@ export const convertAccountSummary = data => {
 export const blueButtonReducer = (state = initialState, action) => {
   // eslint-disable-next-line sonarjs/no-small-switch
   switch (action.type) {
-    case Actions.BlueButtonReport.GET:
-      return {
-        ...state,
-        medicationsList:
+    case Actions.BlueButtonReport.GET: {
+      const updates = {};
+
+      if (action.medicationsResponse) {
+        updates.medicationsList =
           action.medicationsResponse.data?.map(med => {
             return convertMedication(med);
-          }) || [],
-        appointmentsList:
+          }) || [];
+      }
+
+      if (action.appointmentsResponse) {
+        updates.appointmentsList =
           action.appointmentsResponse.data?.map(appt => {
             return convertAppointment(appt);
-          }) || [],
-        demographics:
+          }) || [];
+      }
+
+      if (action.demographicsResponse) {
+        updates.demographics =
           action.demographicsResponse.content?.map(item => {
             return convertDemographics(item);
-          }) || [],
-        militaryService: action.militaryServiceResponse || '',
-        accountSummary: convertAccountSummary(action.patientResponse) || {},
+          }) || [];
+      }
+
+      if (action.militaryServiceResponse) {
+        updates.militaryService = action.militaryServiceResponse || undefined;
+      }
+
+      if (action.patientResponse) {
+        updates.accountSummary =
+          convertAccountSummary(action.patientResponse) || {};
+      }
+
+      return {
+        ...state,
+        ...updates,
       };
+    }
     default:
       return state;
   }
diff --git a/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js b/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js
new file mode 100644
index 000000000000..5b3a295d278a
--- /dev/null
+++ b/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js
@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { mockApiRequest } from '@department-of-veterans-affairs/platform-testing/helpers';
+import sinon from 'sinon';
+import { getBlueButtonReportData } from '../../actions/blueButtonReport';
+import { Actions } from '../../util/actionTypes';
+import allergies from '../fixtures/allergies.json';
+
+describe('getBlueButtonReportData', () => {
+  it('should only get the domains that are specified in the options', () => {
+    const mockData = allergies;
+    mockApiRequest(mockData);
+    const dispatch = sinon.spy();
+    return getBlueButtonReportData({ allergies: true })(dispatch).then(() => {
+      // Verify that dispatch was called only once
+      expect(dispatch.calledOnce).to.be.true;
+
+      // Check the first and only dispatch action type
+      expect(dispatch.firstCall.args[0].type).to.equal(
+        Actions.Allergies.GET_LIST,
+      );
+    });
+  });
+
+  it('should not dispatch any actions if no options are enabled', () => {
+    const dispatch = sinon.spy();
+    return getBlueButtonReportData({})(dispatch).then(() => {
+      // Assert that dispatch was never called
+      expect(dispatch.notCalled).to.be.true;
+    });
+  });
+});
diff --git a/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js b/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js
index b00d0c55e575..1290ab97e192 100644
--- a/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js
+++ b/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js
@@ -432,7 +432,7 @@ describe('blueButtonReducer', () => {
       medicationsList: [],
       appointmentsList: [],
       demographics: [],
-      militaryService: '',
+      militaryService: undefined,
       accountSummary: {
         authenticationSummary: {},
         vaTreatmentFacilities: [],
@@ -442,4 +442,21 @@ describe('blueButtonReducer', () => {
     const newState = blueButtonReducer(initialState, action);
     expect(newState).to.deep.equal(expectedState);
   });
+
+  it('should not overwrite data if keys are missing from the payload', () => {
+    const state = {
+      medicationsList: [],
+      appointmentsList: [],
+      demographics: [],
+      militaryService: 'Testing',
+      accountSummary: [],
+    };
+
+    const action = {
+      type: Actions.BlueButtonReport.GET,
+    };
+
+    const newState = blueButtonReducer(state, action);
+    expect(newState).to.deep.equal(state);
+  });
 });