diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index af0814429..c26b1e3dc 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -227,15 +227,21 @@ export function PartsOrderListTableComponent({
       sorter: (a, b) => a.order_date - b.order_date,
       sortOrder: state.sortedInfo.columnKey === "order_date" && state.sortedInfo.order,
       render: (text, record) => <DateFormatter>{record.order_date}</DateFormatter>
-    },
-    {
+    }
+  ];
+
+  if (!isPartsEntry) {
+    columns.push({
       title: t("parts_orders.fields.return"),
       dataIndex: "return",
       key: "return",
       sorter: (a, b) => a.return - b.return,
       sortOrder: state.sortedInfo.columnKey === "return" && state.sortedInfo.order,
       render: (text, record) => <Checkbox checked={record.return} />
-    },
+    });
+  }
+
+  columns.push(
     {
       title: t("parts_orders.fields.deliver_by"),
       dataIndex: "deliver_by",
@@ -256,7 +262,7 @@ export function PartsOrderListTableComponent({
       render: (text, record) => recordActions(record, true),
       id: "parts-order-list-table-actions"
     }
-  ];
+  );
 
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index f55809209..814e81254 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -11,16 +11,27 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
+import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  isPartsEntry: selectIsPartsEntry
 });
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(PartsOrderModalComponent);
 
-export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState, isReturn, preferredMake, job, form }) {
+export function PartsOrderModalComponent({
+  bodyshop,
+  vendorList,
+  sendTypeState,
+  isReturn,
+  preferredMake,
+  job,
+  form,
+  isPartsEntry
+}) {
   const [sendType, setSendType] = sendTypeState;
 
   const {
@@ -92,7 +103,7 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
             <Checkbox />
           </Form.Item>
         )}
-        {OEConnection.treatment === "on" && !isReturn && (
+        {OEConnection.treatment === "on" && !isReturn && !isPartsEntry && (
           <Form.Item name="is_quote" label={t("parts_orders.labels.is_quote")} valuePropName="checked">
             <Checkbox />
           </Form.Item>
@@ -249,7 +260,7 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
               <Radio disabled={is_quote} value={"p"}>
                 {t("parts_orders.labels.print")}
               </Radio>
-              {OEConnection.treatment === "on" && !isReturn && (
+              {OEConnection.treatment === "on" && !isReturn && !isPartsEntry && (
                 <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
               )}
             </Radio.Group>