diff --git a/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java b/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
index 4708691bea2d940a64bd4a805e360a9765ac1c59..613980b09086b7d940b31029ee6ae692ef224f4f 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
@@ -206,8 +206,9 @@ public class IQIdentityListCourseNodeController extends IdentityListCourseNodeCo
 					resetButton = uifactory.addFormLink("tool.delete.data", formLayout, Link.BUTTON); 
 					resetButton.setIconLeftCSS("o_icon o_icon_delete_item");
 				}
-				if(qtiService.needManualCorrection(testEntry)
-						|| IQEditController.CORRECTION_MANUAL.equals(courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE))) {
+				String correctionMode = courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
+				if(!IQEditController.CORRECTION_GRADING.equals(correctionMode) &&
+						(IQEditController.CORRECTION_MANUAL.equals(correctionMode) || qtiService.needManualCorrection(testEntry))) {
 					correctionButton = uifactory.addFormLink("correction.test.title", formLayout, Link.BUTTON);
 					correctionButton.setElementCssClass("o_sel_correction");
 					correctionButton.setIconLeftCSS("o_icon o_icon-fw o_icon_correction");
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21IdentityListCourseNodeToolsController.java b/src/main/java/org/olat/course/nodes/iq/QTI21IdentityListCourseNodeToolsController.java
index 5fe2ea70cc0d86c1eb57dcdd7b6c8c5eb73e5ae4..2e6c5d20c0da273a259780764fe8f009ed457e40 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21IdentityListCourseNodeToolsController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21IdentityListCourseNodeToolsController.java
@@ -104,8 +104,10 @@ public class QTI21IdentityListCourseNodeToolsController extends AbstractToolsCon
 		this.stackPanel = stackPanel;
 		this.testCourseNode = courseNode;
 		testEntry = courseNode.getReferencedRepositoryEntry();
-		manualCorrections = qtiService.needManualCorrection(testEntry)
-				|| IQEditController.CORRECTION_MANUAL.equals(courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE));
+		
+		String correctionMode = courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
+		manualCorrections = !IQEditController.CORRECTION_GRADING.equals(correctionMode)
+				&& (IQEditController.CORRECTION_MANUAL.equals(correctionMode) || qtiService.needManualCorrection(testEntry));
 		
 		courseEntry = coachCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
 		
diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
index b13e2a836d52caa65f5ecc5831f4e92741878e77..c08f8e684b2234f9c8f448911533662fd40bdd69 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
@@ -183,8 +183,9 @@ public class QTI21AssessmentDetailsController extends FormBasicController {
 		readOnly = coachCourseEnv.isCourseReadOnly();
 		testEntry = courseNode.getReferencedRepositoryEntry();
 		assessedIdentity = assessedUserCourseEnv.getIdentityEnvironment().getIdentity();
-		manualCorrections = qtiService.needManualCorrection(testEntry)
-				|| IQEditController.CORRECTION_MANUAL.equals(courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE));
+		String correctionMode = courseNode.getModuleConfiguration().getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
+		manualCorrections = !IQEditController.CORRECTION_GRADING.equals(correctionMode)
+				&& (IQEditController.CORRECTION_MANUAL.equals(correctionMode) || qtiService.needManualCorrection(testEntry));
 		
 		RepositoryEntry courseEntry = assessedUserCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
 		reSecurity = repositoryManager.isAllowed(ureq, courseEntry);