diff --git a/src/components/pages/expense/ExpenseRequestContent.tsx b/src/components/pages/expense/ExpenseRequestContent.tsx
index 6513956e..8fbc81d7 100644
--- a/src/components/pages/expense/ExpenseRequestContent.tsx
+++ b/src/components/pages/expense/ExpenseRequestContent.tsx
@@ -100,6 +100,7 @@ const ExpenseRequestContent = ({
   const [isCompleteLoading, setIsCompleteLoading] = useState(false);
   const [isApproveLoading, setIsApproveLoading] = useState(false);
   const [isRejectLoading, setIsRejectLoading] = useState(false);
+  const [, setApprovalNotes] = useState('');
 
   const formik = useFormik<UploadRequestDocumentsFormValues>({
     initialValues: {
@@ -130,10 +131,12 @@ const ExpenseRequestContent = ({
   };
 
   const approveClickHandler = () => {
+    setApprovalNotes('');
     approveModal.openModal();
   };
 
   const rejectClickHandler = () => {
+    setApprovalNotes('');
     rejectModal.openModal();
   };
 
@@ -200,6 +203,7 @@ const ExpenseRequestContent = ({
       approveModal.closeModal();
 
       toast.success(approveResponse?.message);
+      setApprovalNotes('');
       router.push('/expense');
     } else {
       approveModal.closeModal();
@@ -234,6 +238,7 @@ const ExpenseRequestContent = ({
       rejectModal.closeModal();
 
       toast.success(rejectResponse.message);
+      setApprovalNotes('');
       router.push('/expense');
     } else {
       rejectModal.closeModal();
@@ -710,6 +715,10 @@ const ExpenseRequestContent = ({
         text='Apakah anda yakin ingin approve data biaya operasional ini?'
         secondaryButton={{
           text: 'Tidak',
+          onClick: () => {
+            setApprovalNotes('');
+            approveModal.closeModal();
+          },
         }}
         primaryButton={{
           text: 'Ya',
@@ -725,6 +734,10 @@ const ExpenseRequestContent = ({
         text='Apakah anda yakin ingin reject data biaya operasional ini?'
         secondaryButton={{
           text: 'Tidak',
+          onClick: () => {
+            setApprovalNotes('');
+            rejectModal.closeModal();
+          },
         }}
         primaryButton={{
           text: 'Ya',
diff --git a/src/components/pages/expense/ExpensesTable.tsx b/src/components/pages/expense/ExpensesTable.tsx
index 69376992..d2d4754c 100644
--- a/src/components/pages/expense/ExpensesTable.tsx
+++ b/src/components/pages/expense/ExpensesTable.tsx
@@ -185,6 +185,7 @@ const ExpensesTable = () => {
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [isApproveLoading, setIsApproveLoading] = useState(false);
   const [isRejectLoading, setIsRejectLoading] = useState(false);
+  const [, setApprovalNotes] = useState('');
 
   const [sorting, setSorting] = useState<SortingState>([]);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
@@ -342,6 +343,7 @@ const ExpensesTable = () => {
             [String(props.row.original.id)]: true,
           });
 
+          setApprovalNotes('');
           approveModal.openModal();
         };
 
@@ -353,6 +355,7 @@ const ExpensesTable = () => {
             [String(props.row.original.id)]: true,
           });
 
+          setApprovalNotes('');
           rejectModal.openModal();
         };
 
@@ -412,10 +415,12 @@ const ExpensesTable = () => {
   // };
 
   const bulkApproveClickHandler = () => {
+    setApprovalNotes('');
     approveModal.openModal();
   };
 
   const bulkRejectClickHandler = () => {
+    setApprovalNotes('');
     rejectModal.openModal();
   };
 
@@ -468,6 +473,7 @@ const ExpensesTable = () => {
         `Berhasil approve ${selectedRowIds.length} data biaya operasional!`
       );
 
+      setApprovalNotes('');
       setRowSelection({});
     } else {
       approveModal.closeModal();
@@ -509,6 +515,7 @@ const ExpensesTable = () => {
       toast.success(
         `Berhasil reject ${selectedRowIds.length} data biaya operasional!`
       );
+      setApprovalNotes('');
       setRowSelection({});
     } else {
       rejectModal.closeModal();
@@ -787,6 +794,10 @@ const ExpensesTable = () => {
         text='Apakah anda yakin ingin approve data biaya operasional ini?'
         secondaryButton={{
           text: 'Tidak',
+          onClick: () => {
+            setApprovalNotes('');
+            approveModal.closeModal();
+          },
         }}
         primaryButton={{
           text: 'Ya',
@@ -802,6 +813,10 @@ const ExpensesTable = () => {
         text='Apakah anda yakin ingin reject data biaya operasional ini?'
         secondaryButton={{
           text: 'Tidak',
+          onClick: () => {
+            setApprovalNotes('');
+            rejectModal.closeModal();
+          },
         }}
         primaryButton={{
           text: 'Ya',
diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index bd937ab8..8f619463 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -3154,7 +3154,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                 text='Apakah anda yakin ingin menyetujui data Recording ini?'
                 secondaryButton={{
                   text: 'Tidak',
-                  onClick: () => setApprovalNotes(''),
+                  onClick: () => {
+                    setApprovalNotes('');
+                    approveModal.closeModal();
+                  },
                 }}
                 primaryButton={{
                   text: 'Ya',
@@ -3176,7 +3179,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                 text='Apakah anda yakin ingin menolak data Recording ini?'
                 secondaryButton={{
                   text: 'Tidak',
-                  onClick: () => setApprovalNotes(''),
+                  onClick: () => {
+                    setApprovalNotes('');
+                    rejectModal.closeModal();
+                  },
                 }}
                 primaryButton={{
                   text: 'Ya',
diff --git a/src/components/pages/purchase/order/PurchaseOrderDetail.tsx b/src/components/pages/purchase/order/PurchaseOrderDetail.tsx
index 1f8dd3c9..02bf443d 100644
--- a/src/components/pages/purchase/order/PurchaseOrderDetail.tsx
+++ b/src/components/pages/purchase/order/PurchaseOrderDetail.tsx
@@ -105,6 +105,7 @@ const PurchaseOrderDetail = ({
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [selectedItem, setSelectedItem] = useState<PurchaseItem | null>(null);
+  const [, setApprovalNotes] = useState('');
 
   const selectedRowIds = Object.keys(rowSelection).map((item) =>
     parseInt(item)
@@ -207,12 +208,15 @@ const PurchaseOrderDetail = ({
 
     switch (approvalStep) {
       case 1:
+        setApprovalNotes('');
         staffApprovalModal.openModal();
         break;
       case 2:
+        setApprovalNotes('');
         confirmationModalWithNotes.openModal();
         break;
       case 3:
+        setApprovalNotes('');
         acceptApprovalModal.openModal();
         break;
       default:
@@ -225,12 +229,15 @@ const PurchaseOrderDetail = ({
 
     switch (approvalStep) {
       case 1:
+        setApprovalNotes('');
         staffRejectionModal.openModal();
         break;
       case 2:
+        setApprovalNotes('');
         managerRejectionModal.openModal();
         break;
       case 3:
+        setApprovalNotes('');
         acceptRejectionModal.openModal();
         break;
       default:
@@ -978,11 +985,16 @@ const PurchaseOrderDetail = ({
             await createManagerApprovalHandler(payload);
             await refreshApprovals();
             await refetchData?.();
+            setApprovalNotes('');
             confirmationModalWithNotes.closeModal();
           },
         }}
         secondaryButton={{
           text: 'Batal',
+          onClick: () => {
+            setApprovalNotes('');
+            confirmationModalWithNotes.closeModal();
+          },
         }}
       />
 
@@ -1079,11 +1091,16 @@ const PurchaseOrderDetail = ({
 
             await createStaffApprovalHandler(payload);
             await refetchData?.();
+            setApprovalNotes('');
             staffRejectionModal.closeModal();
           },
         }}
         secondaryButton={{
           text: 'Batal',
+          onClick: () => {
+            setApprovalNotes('');
+            staffRejectionModal.closeModal();
+          },
         }}
       />
 
@@ -1106,11 +1123,16 @@ const PurchaseOrderDetail = ({
 
             await createAcceptApprovalHandler(payload);
             await refetchData?.();
+            setApprovalNotes('');
             acceptRejectionModal.closeModal();
           },
         }}
         secondaryButton={{
           text: 'Batal',
+          onClick: () => {
+            setApprovalNotes('');
+            acceptRejectionModal.closeModal();
+          },
         }}
       />
 
@@ -1133,11 +1155,16 @@ const PurchaseOrderDetail = ({
 
             await createManagerApprovalHandler(payload);
             await refetchData?.();
+            setApprovalNotes('');
             managerRejectionModal.closeModal();
           },
         }}
         secondaryButton={{
           text: 'Batal',
+          onClick: () => {
+            setApprovalNotes('');
+            managerRejectionModal.closeModal();
+          },
         }}
       />