diff --git a/services/core-web/src/components/Forms/reports/AddReporttoPermitConditionForm.tsx b/services/core-web/src/components/Forms/reports/AddReporttoPermitConditionForm.tsx
index 284167ebca..830c0f599a 100644
--- a/services/core-web/src/components/Forms/reports/AddReporttoPermitConditionForm.tsx
+++ b/services/core-web/src/components/Forms/reports/AddReporttoPermitConditionForm.tsx
@@ -28,6 +28,7 @@ interface AddReportToPermitConditionFormProps {
   permitGuid: string;
   condition: IPermitCondition;
   modalView?: boolean;
+  report?: IMineReport;
 }
 
 export const AddReportToPermitConditionForm: FC<AddReportToPermitConditionFormProps> = ({
@@ -35,8 +36,8 @@ export const AddReportToPermitConditionForm: FC<AddReportToPermitConditionFormPr
   condition,
   permitGuid,
   modalView = true,
+  report,
 }) => {
-  const report = condition?.report;
   const [isEditMode, setIsEditMode] = React.useState(modalView);
 
   return (
@@ -52,7 +53,7 @@ export const AddReportToPermitConditionForm: FC<AddReportToPermitConditionFormPr
             ? { ...report, stepPath: condition.stepPath }
             : {
                 mine_report_status_code: MINE_REPORT_SUBMISSION_CODES.NON,
-                condition: condition.stepPath,
+                stepPath: condition.stepPath,
                 permit_condition_category_code: condition.condition_category_code,
                 permit_condition_type_code: REPORT_TYPE_CODES.PRR,
                 permit_condition_id: condition.permit_condition_id,
diff --git a/services/core-web/src/components/mine/Permit/PermitConditionLayer.tsx b/services/core-web/src/components/mine/Permit/PermitConditionLayer.tsx
index e27be42d66..d10e7123c0 100644
--- a/services/core-web/src/components/mine/Permit/PermitConditionLayer.tsx
+++ b/services/core-web/src/components/mine/Permit/PermitConditionLayer.tsx
@@ -17,6 +17,7 @@ import { closeModal, openModal } from "@mds/common/redux/actions/modalActions";
 import { useParams } from "react-router-dom";
 import { AddReportToPermitConditionForm } from "../../Forms/reports/AddReporttoPermitConditionForm";
 import { createMineReport } from "@mds/common/redux/actionCreators/reportActionCreator";
+import { fetchPermits } from "@mds/common/redux/actionCreators/permitActionCreator";
 
 interface PermitConditionLayerProps {
   condition: IPermitCondition;
@@ -61,6 +62,7 @@ const PermitConditionLayer: FC<PermitConditionLayerProps> = ({
 
   const addNewReport = async (values) => {
     await dispatch(createMineReport(mineGuid, values));
+    dispatch(fetchPermits(mineGuid));
     dispatch(closeModal());
   };
 
@@ -127,6 +129,7 @@ const PermitConditionLayer: FC<PermitConditionLayerProps> = ({
                       }}
                       icon={<FontAwesomeIcon icon={faClipboard} className="margin-medium--right" />}
                       type="default"
+                      disabled={!!subCondition.report}
                     >
                       Add Report
                     </Button>
diff --git a/services/core-web/src/components/mine/Permit/PermitConditions.tsx b/services/core-web/src/components/mine/Permit/PermitConditions.tsx
index 5218ef3b44..7cdecd0409 100644
--- a/services/core-web/src/components/mine/Permit/PermitConditions.tsx
+++ b/services/core-web/src/components/mine/Permit/PermitConditions.tsx
@@ -241,6 +241,7 @@ const PermitConditions: FC<PermitConditionProps> = ({
                                   onSubmit={() => {}}
                                   condition={cond}
                                   permitGuid={permitGuid}
+                                  report={cond.report}
                                 />
                               </Collapse.Panel>
                             ))}