diff --git a/client/src/components/jobs-change-status/jobs-change-status.component.jsx b/client/src/components/jobs-change-status/jobs-change-status.component.jsx
index 406b84d80..4b42b85e3 100644
--- a/client/src/components/jobs-change-status/jobs-change-status.component.jsx
+++ b/client/src/components/jobs-change-status/jobs-change-status.component.jsx
@@ -77,10 +77,14 @@ export function JobsChangeStatus({ job, bodyshop, jobRO }) {
       {availableStatuses.map((item) => (
         <Menu.Item key={item}>{item}</Menu.Item>
       ))}
-      <Menu.Divider />
-      {otherStages.map((item, idx) => (
-        <Menu.Item key={item}>{item}</Menu.Item>
-      ))}
+      {job.converted && (
+        <>
+          <Menu.Divider />
+          {otherStages.map((item, idx) => (
+            <Menu.Item key={item}>{item}</Menu.Item>
+          ))}
+        </>
+      )}
     </Menu>
   );
 
@@ -90,7 +94,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO }) {
       overlay={statusmenu}
       trigger={["click"]}
       key="changestatus"
-      disabled={jobRO}
+      disabled={jobRO || !job.converted}
     >
       <Button>
         {t("jobs.actions.changestatus")} <DownCircleFilled />