diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 7d1596a2d..682e19f94 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -147,16 +147,6 @@ function BillEnterModalContainer({
         })
     );
 
-    // await updateJobLines({
-    //   variables: {
-    //     ids: remainingValues.billlines
-    //       .filter((il) => il.joblineid !== "noline")
-    //       .map((li) => li.joblineid),
-    //     status: bodyshop.md_order_statuses.default_received || "Received*",
-    //     location: location,
-    //   },
-    // });
-
     /////////////////////////
     if (upload && upload.length > 0) {
       //insert Each of the documents?
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 4fb414441..cc69a1f2b 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.voided && !job.date_exported}
+      disabled={(!job.voided && !job.date_exported) || !job.converted}
       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 9ceaf1373..da084bc56 100644
--- a/client/src/pages/jobs-admin/jobs-admin.page.jsx
+++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx
@@ -88,7 +88,10 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
             <Space wrap>
               <ScoreboardAddButton
                 job={data ? data.jobs_by_pk : {}}
-                disabled={data && data.jobs_by_pk.voided}
+                disabled={
+                  (data && data.jobs_by_pk.voided) ||
+                  (data.jobs_by_pk && !data.jobs_by_pk.converted)
+                }
               />
               <JobsAdminDeleteIntake job={data ? data.jobs_by_pk : {}} />
               <JobsAdminMarkReexport job={data ? data.jobs_by_pk : {}} />