diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index 697211ee6..6106a013a 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -10,6 +10,7 @@ import {
   PageHeader,
   InputNumber,
   Input,
+  Switch,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -42,7 +43,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
   const [closeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
 
-  const handleFinish = async (values) => {
+  const handleFinish = async ({ removefromproduction, ...values }) => {
     setLoading(true);
     const result = await client.mutate({
       mutation: generateJobLinesUpdatesForInvoicing(values.joblines),
@@ -63,6 +64,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           kmin: values.kmin,
           kmout: values.kmout,
           dms_allocation: values.dms_allocation,
+          ...(removefromproduction ? { inproduction: false } : {}),
         },
       },
       refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
@@ -248,6 +250,15 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
               onlyFuture={!!bodyshop.cdk_dealerid}
             />
           </Form.Item>
+          {!jobRO && (
+            <Form.Item
+              label={t("jobs.actions.removefromproduction")}
+              name="removefromproduction"
+              valuePropName="checked"
+            >
+              <Switch />
+            </Form.Item>
+          )}
           {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.kmin")}