diff --git a/src/main/java/seedu/duke/storage/commons/FieldValidator.java b/src/main/java/seedu/duke/storage/commons/FieldValidator.java
index 1db4372408..f8bf08eb86 100644
--- a/src/main/java/seedu/duke/storage/commons/FieldValidator.java
+++ b/src/main/java/seedu/duke/storage/commons/FieldValidator.java
@@ -99,12 +99,8 @@ public boolean validate() {
             if (moduleWithLargestCap != null) {
                 ModuleValidator validator = new ModuleValidator();
 
-                if (!validator.isRetakeGrade(moduleWithLargestCap.getGrade())) {
-                    isAllFieldValid = false;
-                    details[INVALID_GRADE]++;
-                }
-
-                if (isAllFieldValid && moduleWithLargestCap.getCap() >= testModule.getCap()) {
+                if (!validator.isRetakeGrade(moduleWithLargestCap.getGrade())
+                        && moduleWithLargestCap.getCap() >= testModule.getCap()) {
                     isAllFieldValid = false;
                     details[INVALID_GRADE]++;
                 }