diff --git a/lib/questionlib.php b/lib/questionlib.php
index 3589a5738a1..79f5788cba3 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -715,6 +715,8 @@ function save_question_session(&$question, &$state) {
             $session->newgraded = $state->id;
             $session->sumpenalty = $state->sumpenalty;
             $session->comment = $state->comment;
+        } else {
+            $session->comment = addslashes($session->comment);
         }
         update_record('question_sessions', $session);
     }
diff --git a/question/comment.html b/question/comment.html
index e004879f858..81f16bf6ae7 100644
--- a/question/comment.html
+++ b/question/comment.html
@@ -10,7 +10,7 @@
     </td>
     <td>
       <?php
-        print_textarea($usehtmleditor, 15, 60, 630, 300, $prefix.'[comment]', $state->comment);
+        print_textarea($usehtmleditor, 15, 60, 630, 300, $prefix.'[comment]', stripslashes($state->comment));
       ?>
     </td>
   </tr>