diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index e69c6fd3026dd6ecc9f7fda812158ee8849f7d5a..ab137e017b4e3e45c96d32bdf066d1d9a06accc8 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -72,9 +72,12 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.question-format.grid-square.enabled:false}")
 	private String gridSquareEnabled;
 
-	@Value("${answerOptionLimit:8}")
+	@Value("${question.answerOptionLimit:8}")
 	private String answerOptionLimit;
 
+	@Value("${question.parse-answer-option-formatting:false}")
+	private String parseAnswerOptionFormatting;
+
 	@RequestMapping(value = { "/" }, method = RequestMethod.GET)
 	@ResponseBody
 	public final HashMap<String, Object> getConfiguration(HttpServletRequest request) {
@@ -107,6 +110,7 @@ public class ConfigurationController extends AbstractController {
 		}
 
 		config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
+		config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
 
 		config.put("features", features);
 
diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example
index 89caad29e3f5af18063e00aa17c86775c67d5db2..b44d2002b79c524a3af56e145bf6dfa63ae6e975 100644
--- a/src/main/webapp/arsnova.properties.example
+++ b/src/main/webapp/arsnova.properties.example
@@ -66,6 +66,11 @@ upload.filesize_b=1048576
 # maximal number of answer options allowed for a skill question
 question.answerOptionLimit=8
 
+# Enable Markdown and MathJax parsing in answer options. Formatting in answer options should
+# be used cautiously since it could lead to display errors. Answer options will still not
+# be parsed in diagrams. This setting has no effect if neither MathJax nor Markdown are enabled.
+question.parse-answer-option-formatting=false
+
 couchdb.host=localhost
 couchdb.port=5984
 couchdb.name=arsnova
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 89caad29e3f5af18063e00aa17c86775c67d5db2..b44d2002b79c524a3af56e145bf6dfa63ae6e975 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -66,6 +66,11 @@ upload.filesize_b=1048576
 # maximal number of answer options allowed for a skill question
 question.answerOptionLimit=8
 
+# Enable Markdown and MathJax parsing in answer options. Formatting in answer options should
+# be used cautiously since it could lead to display errors. Answer options will still not
+# be parsed in diagrams. This setting has no effect if neither MathJax nor Markdown are enabled.
+question.parse-answer-option-formatting=false
+
 couchdb.host=localhost
 couchdb.port=5984
 couchdb.name=arsnova