diff --git a/question/type/multichoice/renderer.php b/question/type/multichoice/renderer.php
index 89563b2bb9d..93154f09644 100644
--- a/question/type/multichoice/renderer.php
+++ b/question/type/multichoice/renderer.php
@@ -104,7 +104,11 @@ abstract class qtype_multichoice_renderer_base extends qtype_with_combined_feedb
                 ));
             }
 
-            $questionnumber = html_writer::span($this->number_in_style($value, $question->answernumbering), 'answernumber');
+            $questionnumber = '';
+            if ($question->answernumbering !== 'none') {
+                $questionnumber = html_writer::span(
+                        $this->number_in_style($value, $question->answernumbering), 'answernumber');
+            }
             $answertext = $question->format_text($ans->answer, $ans->answerformat, $qa, 'question', 'answer', $ansid);
             $questionanswer = html_writer::div($answertext, 'flex-fill ml-1');
 
diff --git a/question/type/multichoice/styles.css b/question/type/multichoice/styles.css
index df8ed862d91..546ad39cdd2 100644
--- a/question/type/multichoice/styles.css
+++ b/question/type/multichoice/styles.css
@@ -26,6 +26,10 @@
     width: 14px;
 }
 
+.que.multichoice .answer .answernumber {
+    min-width: 1.5em;
+}
+
 /* Editing form. */
 body#page-question-type-multichoice div[id^=fitem_id_][id*=answer_] {
     background: #eee;