diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 41d273976..56e402f25 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -3654,6 +3654,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>bill_allow_post_to_closed</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>bill_federal_tax_rate</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
index d16ba9ecc..c8eb78281 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -177,8 +177,6 @@ export function BillDetailEditcontainer({
   useEffect(() => {
     if (search.billid && data) {
       form.resetFields();
-      form.resetFields();
-      form.setFieldsValue(transformData(data));
     }
   }, [form, search.billid, data]);
 
diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index ada281f6a..0c48a61df 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -229,6 +229,7 @@ export function BillFormComponent({
             ({ getFieldValue }) => ({
               validator(rule, value) {
                 if (
+                  !bodyshop.bill_allow_post_to_closed &&
                   (job.status === bodyshop.md_ro_statuses.default_invoiced ||
                     job.status === bodyshop.md_ro_statuses.default_exported ||
                     job.status === bodyshop.md_ro_statuses.default_void) &&
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 8dfba38f9..0eeb78d4a 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -558,6 +558,13 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["bill_allow_post_to_closed"]}
+          label={t("bodyshop.fields.bill_allow_post_to_closed")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["md_ded_notes"]}
           label={t("bodyshop.fields.md_ded_notes")}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 9d3b64c4f..26f3f72a0 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -105,6 +105,7 @@ export const QUERY_BODYSHOP = gql`
       md_from_emails
       last_name_first
       md_parts_order_comment
+      bill_allow_post_to_closed
       employees {
         user_email
         id
@@ -207,6 +208,7 @@ export const UPDATE_SHOP = gql`
         md_from_emails
         last_name_first
         md_parts_order_comment
+        bill_allow_post_to_closed
         employees {
           id
           first_name
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 19d7ee498..76282749e 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -233,6 +233,7 @@
 				},
 				"appt_length": "Default Appointment Length",
 				"attach_pdf_to_email": "Attach PDF copy to sent emails?",
+				"bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs",
 				"bill_federal_tax_rate": "Bills - Federal Tax Rate %",
 				"bill_local_tax_rate": "Bill - Provincial/State Tax Rate %",
 				"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index ac92027bf..5e67fd462 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -233,6 +233,7 @@
 				},
 				"appt_length": "",
 				"attach_pdf_to_email": "",
+				"bill_allow_post_to_closed": "",
 				"bill_federal_tax_rate": "",
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 7d19a3549..fb982cf6d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -233,6 +233,7 @@
 				},
 				"appt_length": "",
 				"attach_pdf_to_email": "",
+				"bill_allow_post_to_closed": "",
 				"bill_federal_tax_rate": "",
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",