diff --git a/app/helpers/question_view_helper.rb b/app/helpers/question_view_helper.rb
index c1f9de54e..f280b4ee9 100644
--- a/app/helpers/question_view_helper.rb
+++ b/app/helpers/question_view_helper.rb
@@ -39,7 +39,7 @@ module QuestionViewHelper
 
   def select_option_name(value)
     return value.service_name if value.respond_to?(:service_name)
-    return value["name"] if value["name"].present?
+    return value["name"] if value.is_a?(Hash) && value["name"].present?
   end
 
 private
diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb
index 7e6392522..a9660c448 100644
--- a/app/models/form/lettings/questions/nationality_all.rb
+++ b/app/models/form/lettings/questions/nationality_all.rb
@@ -215,4 +215,8 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
     "894" => { "name" => "Zambia", "synonyms" => "ZM" },
     "716" => { "name" => "Zimbabwe", "synonyms" => "ZW" },
   }.freeze
+
+  def answer_label(log, _current_user = nil)
+    ANSWER_OPTIONS[log.nationality_all.to_s]["name"]
+  end
 end
diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb
index 6c7c281bd..b36fd39ac 100644
--- a/app/models/form/sales/questions/nationality_all.rb
+++ b/app/models/form/sales/questions/nationality_all.rb
@@ -214,4 +214,8 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
     "894" => { "name" => "Zambia", "synonyms" => "ZM" },
     "716" => { "name" => "Zimbabwe", "synonyms" => "ZW" },
   }.freeze
+
+  def answer_label(log, _current_user = nil)
+    ANSWER_OPTIONS[log.send(id).to_s]["name"]
+  end
 end