diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21EditForm.java b/src/main/java/org/olat/course/nodes/iq/QTI21EditForm.java
index f8956426b092f7e617d1d1bff2f747f6cbd86f64..d4eea0cf2f633b933b881161b1d57f1dcc56472f 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21EditForm.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21EditForm.java
@@ -128,6 +128,7 @@ public class QTI21EditForm extends FormBasicController {
 		testDateDependentEl.select("xx", testDateDependent);
 		testDateDependentEl.setHelpTextKey("qti.form.test.date.help", null);
 		testDateDependentEl.addActionListener(FormEvent.ONCLICK);
+		testDateDependentEl.setVisible(testDateDependent); // @UIBK: only show this option if it has already been configured
 	
 		Date startTestDate = modConfig.getDateValue(IQEditController.CONFIG_KEY_RESULTS_START_TEST_DATE);
 		startTestDateElement = uifactory.addDateChooser("qti_form_start_test_date", "qti.form.date.start", startTestDate, formLayout);