diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
index 007bcb2cb..fb0916933 100644
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -8,7 +8,11 @@ import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 
-export default function ScoreboardAddButton({ job, ...otherBtnProps }) {
+export default function ScoreboardAddButton({
+  job,
+  disabled,
+  ...otherBtnProps
+}) {
   const { t } = useTranslation();
   const [insertScoreboardEntry] = useMutation(INSERT_SCOREBOARD_ENTRY);
   const [loading, setLoading] = useState(false);
@@ -118,7 +122,12 @@ export default function ScoreboardAddButton({ job, ...otherBtnProps }) {
 
   return (
     <Popover content={overlay} visible={visibility}>
-      <Button loading={loading} onClick={handleClick} {...otherBtnProps}>
+      <Button
+        loading={loading}
+        disabled={disabled}
+        onClick={handleClick}
+        {...otherBtnProps}
+      >
         {t("jobs.actions.addtoscoreboard")}
       </Button>
     </Popover>
diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
index f6002d144..4fb414441 100644
--- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
+++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
@@ -57,7 +57,7 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
   return (
     <Button
       loading={loading}
-      disabled={!job.date_exported}
+      disabled={!job.voided && !job.date_exported}
       onClick={handleUpdate}
     >
       {t("jobs.labels.markforreexport")}
diff --git a/client/src/pages/jobs-admin/jobs-admin.page.jsx b/client/src/pages/jobs-admin/jobs-admin.page.jsx
index beb1f1076..9ceaf1373 100644
--- a/client/src/pages/jobs-admin/jobs-admin.page.jsx
+++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx
@@ -86,7 +86,10 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
         <Col {...colSpan}>
           <Card style={cardStyle}>
             <Space wrap>
-              <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
+              <ScoreboardAddButton
+                job={data ? data.jobs_by_pk : {}}
+                disabled={data && data.jobs_by_pk.voided}
+              />
               <JobsAdminDeleteIntake job={data ? data.jobs_by_pk : {}} />
               <JobsAdminMarkReexport job={data ? data.jobs_by_pk : {}} />
               <JobsAdminUnvoid job={data ? data.jobs_by_pk : {}} />