diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 5b2e9d5c3..cfb1da4c3 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -35,7 +35,7 @@ class Form::Question
 
   def answer_label(case_log)
     return checkbox_answer_label(case_log) if type == "checkbox"
-    return case_log[id].to_formatted_s(:govuk_date) if type == "date"
+    return case_log[id]&.to_formatted_s(:govuk_date).to_s if type == "date"
 
     return case_log[id].to_s if case_log[id].present?
 
diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb
index 32bea6032..2be973ddb 100644
--- a/spec/models/form/question_spec.rb
+++ b/spec/models/form/question_spec.rb
@@ -120,6 +120,11 @@ RSpec.describe Form::Question, type: :model do
         case_log.mrcdate = Time.zone.local(2021, 10, 11)
         expect(subject.answer_label(case_log)).to eq("11 October 2021")
       end
+
+      it "can handle nils" do
+        case_log.mrcdate = nil
+        expect(subject.answer_label(case_log)).to eq("")
+      end
     end
 
     context "when type is checkbox" do