diff --git a/app/models/form/lettings/questions/address_search.rb b/app/models/form/lettings/questions/address_search.rb
index e066a8bc7..c6abe9a6c 100644
--- a/app/models/form/lettings/questions/address_search.rb
+++ b/app/models/form/lettings/questions/address_search.rb
@@ -14,8 +14,7 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question
     return {} unless ActiveRecord::Base.connected?
     return {} unless log&.address_search_options&.any?
 
-    option = log.address_search_options.first
-    { option[:uprn] => { "value" => "#{option[:address]} (#{option[:uprn]})" } }
+    { log.address_search_options.first[:uprn] => { "value" => "#{log.address_search_options.first[:address]} (#{log.address_search_options.first[:uprn]})" } }
   end
 
   def get_extra_check_answer_value(log)
diff --git a/app/models/form/sales/questions/address_search.rb b/app/models/form/sales/questions/address_search.rb
index b9496c2d4..c219f13f1 100644
--- a/app/models/form/sales/questions/address_search.rb
+++ b/app/models/form/sales/questions/address_search.rb
@@ -14,8 +14,7 @@ class Form::Sales::Questions::AddressSearch < ::Form::Question
     return {} unless ActiveRecord::Base.connected?
     return {} unless log&.address_search_options&.any?
 
-    option = log.address_search_options.first
-    { option[:uprn] => { "value" => "#{option[:address]} (#{option[:uprn]})" } }
+    { log.address_search_options.first[:uprn] => { "value" => "#{log.address_search_options.first[:address]} (#{log.address_search_options.first[:uprn]})" } }
   end
 
   def get_extra_check_answer_value(log)