diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index b84b5081..70508be1 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -588,28 +588,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                   approvalStatus = 'REJECTED';
                   break;
                 case 'UPDATED':
-                  if (currentStepNumber === latestStepNumber) {
-                    switch (latestApproval.action) {
-                      case 'CREATED':
-                      case 'APPROVED':
-                        approvalStatus = 'APPROVED';
-                        break;
-                      case 'REJECTED':
-                        approvalStatus = 'REJECTED';
-                        break;
-                      default:
-                        approvalStatus = 'WAITING';
-                        break;
-                    }
-                  } else {
-                    approvalStatus = 'APPROVED';
-                  }
+                  approvalStatus = 'APPROVED';
                   break;
                 default:
-                  approvalStatus =
-                    currentStepNumber === latestStepNumber
-                      ? 'WAITING'
-                      : 'APPROVED';
+                  approvalStatus = 'APPROVED';
                   break;
               }
             }
diff --git a/src/components/pages/production/recording/grading/form/GradingForm.tsx b/src/components/pages/production/recording/grading/form/GradingForm.tsx
index f046c2c4..30bb8bfd 100644
--- a/src/components/pages/production/recording/grading/form/GradingForm.tsx
+++ b/src/components/pages/production/recording/grading/form/GradingForm.tsx
@@ -288,28 +288,10 @@ const GradingForm = ({ type = 'add', initialValues }: GradingFormProps) => {
                   approvalStatus = 'REJECTED';
                   break;
                 case 'UPDATED':
-                  if (currentStepNumber === latestStepNumber) {
-                    switch (latestApproval.action) {
-                      case 'CREATED':
-                      case 'APPROVED':
-                        approvalStatus = 'APPROVED';
-                        break;
-                      case 'REJECTED':
-                        approvalStatus = 'REJECTED';
-                        break;
-                      default:
-                        approvalStatus = 'WAITING';
-                        break;
-                    }
-                  } else {
-                    approvalStatus = 'APPROVED';
-                  }
+                  approvalStatus = 'APPROVED';
                   break;
                 default:
-                  approvalStatus =
-                    currentStepNumber === latestStepNumber
-                      ? 'WAITING'
-                      : 'APPROVED';
+                  approvalStatus = 'APPROVED';
                   break;
               }
             }