diff --git a/app/models/form/lettings/questions/address_search.rb b/app/models/form/lettings/questions/address_search.rb
index ed7edf894..e066a8bc7 100644
--- a/app/models/form/lettings/questions/address_search.rb
+++ b/app/models/form/lettings/questions/address_search.rb
@@ -12,11 +12,10 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question
 
   def answer_options(log = nil, _user = nil)
     return {} unless ActiveRecord::Base.connected?
-    return {} unless log&.address_options&.any?
+    return {} unless log&.address_search_options&.any?
 
-    log.address_options.each_with_object({}) do |option, hash|
-      hash[option[:uprn]] = { "value" => "#{option[:address]} (#{option[:uprn]})" }
-    end
+    option = log.address_search_options.first
+    { option[:uprn] => { "value" => "#{option[:address]} (#{option[: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 d6acbaba1..b9496c2d4 100644
--- a/app/models/form/sales/questions/address_search.rb
+++ b/app/models/form/sales/questions/address_search.rb
@@ -12,11 +12,10 @@ class Form::Sales::Questions::AddressSearch < ::Form::Question
 
   def answer_options(log = nil, _user = nil)
     return {} unless ActiveRecord::Base.connected?
-    return {} unless log&.address_options&.any?
+    return {} unless log&.address_search_options&.any?
 
-    log.address_options.each_with_object({}) do |option, hash|
-      hash[option[:uprn]] = { "value" => "#{option[:address]} (#{option[:uprn]})" }
-    end
+    option = log.address_search_options.first
+    { option[:uprn] => { "value" => "#{option[:address]} (#{option[:uprn]})" } }
   end
 
   def get_extra_check_answer_value(log)