diff --git a/frontend/src/components/submission_notes/base/FeedbackComment.vue b/frontend/src/components/submission_notes/base/FeedbackComment.vue
index a8c0ededd378ae7799bd41ee6b975d9ce4b037d7..a2afbacdd18a5c5292429f237458dade7a2e4967 100644
--- a/frontend/src/components/submission_notes/base/FeedbackComment.vue
+++ b/frontend/src/components/submission_notes/base/FeedbackComment.vue
@@ -44,9 +44,7 @@
           <span>Won't be visible to student</span>
         </v-tooltip>
       </div>
-      <div class="message">
-        {{ text }}
-      </div>
+      <pre><div class="message">{{ text }}</div></pre>
       <v-btn
         v-if="deletable"
         flat
diff --git a/frontend/src/store/modules/submission-notes.ts b/frontend/src/store/modules/submission-notes.ts
index 78bc156bf64726cbd8b48816f00fb3211bf06f96..72caa195368c5d04d0b9b51cbcb68175a7fd9329 100644
--- a/frontend/src/store/modules/submission-notes.ts
+++ b/frontend/src/store/modules/submission-notes.ts
@@ -75,6 +75,8 @@ const submissionGetter = mb.read(function submission(state, getters) {
   let highlighted = state.submission.text || ''
   if (language !== SubmissionType.ProgrammingLanguageEnum.Markdown) {
     highlighted = hljs.highlight(language, highlighted, true).value
+  } else if (language === SubmissionType.ProgrammingLanguageEnum.Markdown) {
+    highlighted = hljs.highlight('plaintext', highlighted, true).value
   }
   // const highlighted = state.submission.text || ''
   const postProcessed = syntaxPostProcess(highlighted)