diff --git a/src/main/java/org/olat/course/nodes/iq/IQSURVCourseNodeConfiguration.java b/src/main/java/org/olat/course/nodes/iq/IQSURVCourseNodeConfiguration.java
index a4549101b13385ee67ebe722054ba92f443ee919..4b8f1c53a8cde64228f4771ea6761dde60036e1b 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQSURVCourseNodeConfiguration.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQSURVCourseNodeConfiguration.java
@@ -27,6 +27,7 @@ package org.olat.course.nodes.iq;
 
 import java.util.Locale;
 
+import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.course.nodes.AbstractCourseNodeConfiguration;
@@ -34,6 +35,7 @@ import org.olat.course.nodes.CourseNode;
 import org.olat.course.nodes.CourseNodeConfiguration;
 import org.olat.course.nodes.CourseNodeGroup;
 import org.olat.course.nodes.IQSURVCourseNode;
+import org.olat.ims.qti.QTIModule;
 /**
  * @author guido
  */
@@ -48,6 +50,11 @@ public class IQSURVCourseNodeConfiguration extends AbstractCourseNodeConfigurati
 		return new IQSURVCourseNode();
 	}
 
+	@Override
+	public boolean isDeprecated() {
+		return !CoreSpringFactory.getImpl(QTIModule.class).isCreateSurveyCourseNodesEnabled();
+	}
+
 	@Override
 	public String getLinkText(Locale locale) {
 		Translator fallback = Util.createPackageTranslator(CourseNodeConfiguration.class, locale);
diff --git a/src/main/java/org/olat/ims/qti/QTIModule.java b/src/main/java/org/olat/ims/qti/QTIModule.java
index efa248150a9d5dc205df1781e875db7c5469dc21..12a1b04d38e97de37ca9f1d365d6fb1cae046421 100644
--- a/src/main/java/org/olat/ims/qti/QTIModule.java
+++ b/src/main/java/org/olat/ims/qti/QTIModule.java
@@ -46,6 +46,8 @@ public class QTIModule extends AbstractSpringModule {
 	private boolean createResourcesEnabled;
 	@Value("${qti12.survey.create.resources.enabled:false}")
 	private boolean createSurveyResourcesEnabled;
+	@Value("${qti12.survey.create.course.nodes.enabled:false}")
+	private boolean createSurveyCourseNodesEnabled;
 	@Value("${qti12.edit.resources.enabled:false}")
 	private boolean createEditResourcesEnabled;
 
@@ -74,6 +76,10 @@ public class QTIModule extends AbstractSpringModule {
 		return createSurveyResourcesEnabled;
 	}
 	
+	public boolean isCreateSurveyCourseNodesEnabled() {
+		return createSurveyCourseNodesEnabled;
+	}
+
 	public boolean isEditResourcesEnabled() {
 		return createEditResourcesEnabled;
 	}
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index c5097ed3dd406c37c89da8db05471fea1a6e87bc..3e137c4c799216926c5a49e57548d628c6c1da3d 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -396,6 +396,7 @@ qti21.import.encoding.fallback=
 qti12.edit.resources.enabled=false
 qti12.create.resources.enabled=false
 qti12.survey.create.resources.enabled=false
+qti12.survey.create.course.nodes.enabled=false
 
 ########################################################################
 # Certificates