diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 82cae444c..91a56c981 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -858,6 +858,10 @@ private
     return unless startdate
     return unless form.start_year_after_2024?
 
-    uprn_selection_changed? || select_best_address_match || startdate_changed?
+    if select_best_address_match
+      address_line1_input.present? && postcode_full_input.present?
+    else
+      uprn_selection_changed? || startdate_changed?
+    end
   end
 end
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 69865c1fb..c59462cae 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -442,7 +442,11 @@ class SalesLog < Log
     return unless saledate
     return unless form.start_year_after_2024?
 
-    uprn_selection_changed? || select_best_address_match || saledate_changed?
+    if select_best_address_match
+      address_line1_input.present? && postcode_full_input.present?
+    else
+      uprn_selection_changed? || saledate_changed?
+    end
   end
 
   def value_with_discount
diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
index 98dd2ab53..b6ccdf7ab 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -1445,7 +1445,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_16: "1234567890123" }) }
 
         it "adds an appropriate error" do
-          expect(parser.errors[:field_16]).to eql(["UPRN is not recognised. Check the number, or enter the address"])
+          expect(parser.errors[:field_16]).to eql(["UPRN must be 12 digits or less"])
         end
       end