diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 03ac9e2ea..98b349e8a 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -470,6 +470,9 @@ export const GET_JOB_BY_PK = gql`
       clm_total
       comment
       converted
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       csiinvites {
         completedon
         id
diff --git a/client/src/pages/jobs-admin/jobs-admin.page.jsx b/client/src/pages/jobs-admin/jobs-admin.page.jsx
index c237846be..65635618b 100644
--- a/client/src/pages/jobs-admin/jobs-admin.page.jsx
+++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Card, Col, Result, Row, Space, Typography } from "antd";
+import { Button, Card, Col, Result, Row, Space, Typography } from "antd";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -136,14 +136,10 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, bodyshop
               <JobsAdminUnvoid job={data ? data.jobs_by_pk : {}} />
               <JobsAdminStatus job={data ? data.jobs_by_pk : {}} />
               <JobsAdminRemoveAR job={data ? data.jobs_by_pk : {}} />
-              {isReynoldsMode && !job?.dms_id && job?.converted && (
-                <button
-                  className="ant-btn ant-btn-default"
-                  disabled={!!job?.dms_id}
-                  onClick={() => setShowEarlyROModal(true)}
-                >
+              {isReynoldsMode && job?.converted && !job?.dms_id && !job?.dms_customer_id && !job?.dms_advisor_id && (
+                <Button className="ant-btn ant-btn-default" onClick={() => setShowEarlyROModal(true)}>
                   Create RR RO
-                </button>
+                </Button>
               )}
             </Space>
           </Card>