diff --git a/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php b/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php
index db2c46b0f9d2..ac1009b98d9e 100644
--- a/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php
+++ b/Modules/TestQuestionPool/classes/class.assKprimChoiceGUI.php
@@ -310,7 +310,7 @@ private function handleAnswerTextsSubmit($answers)
         }
         
         foreach ($answers as $key => $answer) {
-            $answer->setAnswerText(ilUtil::secureString($answer->getAnswerText()));
+            $answer->setAnswerText(ilUtil::secureString(htmlspecialchars($answer->getAnswerText())));
         }
         
         return $answers;
diff --git a/Modules/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php b/Modules/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php
index d6ae4650ce32..e3642a71d1ff 100644
--- a/Modules/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php
+++ b/Modules/TestQuestionPool/classes/class.ilKprimChoiceWizardInputGUI.php
@@ -184,7 +184,7 @@ public function insert($a_tpl)
                 }
 
                 $tpl->setCurrentBlock("prop_text_propval");
-                $tpl->setVariable("PROPERTY_VALUE", ilUtil::prepareFormOutput($value->getAnswertext()));
+                $tpl->setVariable("PROPERTY_VALUE", ilUtil::prepareFormOutput(htmlspecialchars_decode($value->getAnswertext())));
                 $tpl->parseCurrentBlock();
 
                 $tpl->setCurrentBlock('singleline');