diff --git a/app/models/form/lettings/pages/address_selection.rb b/app/models/form/lettings/pages/address_selection.rb
index 3ba14e7b8..291486593 100644
--- a/app/models/form/lettings/pages/address_selection.rb
+++ b/app/models/form/lettings/pages/address_selection.rb
@@ -13,7 +13,7 @@ class Form::Lettings::Pages::AddressSelection < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
-    log.uprn_known.present? && log.uprn_known.zero? && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options.count)
+    log.uprn_known.present? && log.uprn_known.zero? && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
   end
 
   def skip_text
diff --git a/app/models/form/lettings/questions/address_selection.rb b/app/models/form/lettings/questions/address_selection.rb
index 2b6ac4099..acf8ef968 100644
--- a/app/models/form/lettings/questions/address_selection.rb
+++ b/app/models/form/lettings/questions/address_selection.rb
@@ -12,7 +12,6 @@ class Form::Lettings::Questions::AddressSelection < ::Form::Question
     answer_opts = { "-1" => { "value" => "The address is not listed, I want to enter the address manually" } }
     return answer_opts unless ActiveRecord::Base.connected?
     return answer_opts unless log&.address_options
-    return answer_opts if log.errors.of_kind?(:address_selection, :address_error)
 
     answer_opts = {}
 
diff --git a/app/models/log.rb b/app/models/log.rb
index 4c966d175..10b766e39 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -118,7 +118,7 @@ class Log < ApplicationRecord
       service = AddressClient.new(address_string)
       service.call
 
-      return errors.add(:address_selection, :address_error, message: service.error) if service.error.present?
+      return nil if service.error.present?
 
       address_opts = []
       service.result.first(10).each do |result|
diff --git a/app/services/address_client.rb b/app/services/address_client.rb
index 02fad05c3..2f0ded738 100644
--- a/app/services/address_client.rb
+++ b/app/services/address_client.rb
@@ -40,6 +40,7 @@ private
       query: address,
       key: ENV["OS_DATA_KEY"],
       maxresults: 10,
+      minmatch: 0.6,
     }
     uri.query = URI.encode_www_form(params)
     uri.to_s