diff --git a/app/models/form/lettings/pages/address_matcher.rb b/app/models/form/lettings/pages/address_matcher.rb
index aab5d94cd..cdd4a0e74 100644
--- a/app/models/form/lettings/pages/address_matcher.rb
+++ b/app/models/form/lettings/pages/address_matcher.rb
@@ -26,4 +26,8 @@ class Form::Lettings::Pages::AddressMatcher < ::Form::Page
 
     "/#{log.log_type.dasherize}s/#{log.id}/property-unit-type"
   end
+
+  def routed_to?(log, _current_user = nil)
+    false if form.start_year_2024_or_later?
+  end
 end
diff --git a/app/models/form/lettings/pages/no_address_found.rb b/app/models/form/lettings/pages/no_address_found.rb
index 631d6f58e..dd77ed253 100644
--- a/app/models/form/lettings/pages/no_address_found.rb
+++ b/app/models/form/lettings/pages/no_address_found.rb
@@ -28,4 +28,8 @@ class Form::Lettings::Pages::NoAddressFound < ::Form::Page
   def interruption_screen_question_ids
     %w[address_line1_input]
   end
+
+  def routed_to?(log, _current_user = nil)
+    false if form.start_year_2024_or_later?
+  end
 end
diff --git a/app/models/form/lettings/pages/uprn.rb b/app/models/form/lettings/pages/uprn.rb
index b9a3a4e94..cd3cbdc1a 100644
--- a/app/models/form/lettings/pages/uprn.rb
+++ b/app/models/form/lettings/pages/uprn.rb
@@ -30,4 +30,8 @@ class Form::Lettings::Pages::Uprn < ::Form::Page
       "address"
     end
   end
+
+  def routed_to?(log, _current_user = nil)
+    false if form.start_year_2024_or_later?
+  end
 end
diff --git a/app/models/form/lettings/pages/uprn_confirmation.rb b/app/models/form/lettings/pages/uprn_confirmation.rb
index 26cde2d97..faef87669 100644
--- a/app/models/form/lettings/pages/uprn_confirmation.rb
+++ b/app/models/form/lettings/pages/uprn_confirmation.rb
@@ -12,6 +12,8 @@ class Form::Lettings::Pages::UprnConfirmation < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
+    return false if form.start_year_2024_or_later?
+
     log.uprn.present? && log.uprn_known == 1
   end
 end
diff --git a/app/models/form/lettings/pages/uprn_selection.rb b/app/models/form/lettings/pages/uprn_selection.rb
index 96bfe68e8..cc12b5767 100644
--- a/app/models/form/lettings/pages/uprn_selection.rb
+++ b/app/models/form/lettings/pages/uprn_selection.rb
@@ -16,6 +16,8 @@ class Form::Lettings::Pages::UprnSelection < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
+    return false if form.start_year_2024_or_later?
+
     !log.is_supported_housing? && (log.uprn_known.nil? || log.uprn_known.zero?) && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
   end
 
diff --git a/app/models/form/lettings/subsections/property_information.rb b/app/models/form/lettings/subsections/property_information.rb
index e411dc0e4..5bd04f2c6 100644
--- a/app/models/form/lettings/subsections/property_information.rb
+++ b/app/models/form/lettings/subsections/property_information.rb
@@ -32,12 +32,12 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection
   def uprn_questions
     if form.start_year_2024_or_later?
       [
-        # Form::Lettings::Pages::Uprn.new(nil, nil, self),
-        # Form::Lettings::Pages::UprnConfirmation.new(nil, nil, self),
+        Form::Lettings::Pages::Uprn.new(nil, nil, self),
+        Form::Lettings::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Lettings::Pages::AddressSearch.new(nil, nil, self),
-        # Form::Lettings::Pages::AddressMatcher.new(nil, nil, self),
-        # Form::Lettings::Pages::NoAddressFound.new(nil, nil, self), # soft validation
-        # Form::Lettings::Pages::UprnSelection.new(nil, nil, self),
+        Form::Lettings::Pages::AddressMatcher.new(nil, nil, self),
+        Form::Lettings::Pages::NoAddressFound.new(nil, nil, self), # soft validation
+        Form::Lettings::Pages::UprnSelection.new(nil, nil, self),
         Form::Lettings::Pages::AddressFallback.new(nil, nil, self),
       ]
     else
diff --git a/app/models/form/sales/pages/address_matcher.rb b/app/models/form/sales/pages/address_matcher.rb
index fd7e95499..2582f868a 100644
--- a/app/models/form/sales/pages/address_matcher.rb
+++ b/app/models/form/sales/pages/address_matcher.rb
@@ -4,9 +4,9 @@ class Form::Sales::Pages::AddressMatcher < ::Form::Page
     @id = "address_matcher"
     @copy_key = "sales.property_information.address_matcher"
     @depends_on = [
-      { "uprn_known" => nil },
-      { "uprn_known" => 0 },
-      { "uprn_confirmed" => 0 },
+      { "uprn_known" => nil, "address_export_and_display?" => true },
+      { "uprn_known" => 0, "address_export_and_display?" => true },
+      { "uprn_confirmed" => 0, "address_export_and_display?" => true },
     ]
   end
 
@@ -26,4 +26,8 @@ class Form::Sales::Pages::AddressMatcher < ::Form::Page
 
     "/#{log.log_type.dasherize}s/#{log.id}/property-number-of-bedrooms"
   end
+
+  def routed_to?(log, _current_user)
+    false if form.start_year_2024_or_later?
+  end
 end
diff --git a/app/models/form/sales/pages/no_address_found.rb b/app/models/form/sales/pages/no_address_found.rb
index e0ff5bcb2..3a68c971f 100644
--- a/app/models/form/sales/pages/no_address_found.rb
+++ b/app/models/form/sales/pages/no_address_found.rb
@@ -28,4 +28,8 @@ class Form::Sales::Pages::NoAddressFound < ::Form::Page
   def interruption_screen_question_ids
     %w[address_line1_input]
   end
+
+  def routed_to?(log, _current_user)
+    false if form.start_year_2024_or_later?
+  end
 end
diff --git a/app/models/form/sales/pages/uprn.rb b/app/models/form/sales/pages/uprn.rb
index a78b87c2f..9c9fccaa3 100644
--- a/app/models/form/sales/pages/uprn.rb
+++ b/app/models/form/sales/pages/uprn.rb
@@ -29,4 +29,8 @@ class Form::Sales::Pages::Uprn < ::Form::Page
       "address"
     end
   end
+
+  def routed_to?(log, _current_user = nil)
+    false if form.start_year_2024_or_later?
+  end
 end
diff --git a/app/models/form/sales/pages/uprn_confirmation.rb b/app/models/form/sales/pages/uprn_confirmation.rb
index 9cc2ccf94..4a4e94455 100644
--- a/app/models/form/sales/pages/uprn_confirmation.rb
+++ b/app/models/form/sales/pages/uprn_confirmation.rb
@@ -2,6 +2,7 @@ class Form::Sales::Pages::UprnConfirmation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "uprn_confirmation"
+    @depends_on = [{ "address_export_and_display?" => true }]
   end
 
   def questions
@@ -11,6 +12,8 @@ class Form::Sales::Pages::UprnConfirmation < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
+    return false if form.start_year_2024_or_later?
+
     log.uprn.present? && log.uprn_known == 1
   end
 end
diff --git a/app/models/form/sales/pages/uprn_selection.rb b/app/models/form/sales/pages/uprn_selection.rb
index 6dc5bb2bc..b1ba76b08 100644
--- a/app/models/form/sales/pages/uprn_selection.rb
+++ b/app/models/form/sales/pages/uprn_selection.rb
@@ -16,6 +16,8 @@ class Form::Sales::Pages::UprnSelection < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
+    return false if form.start_year_2024_or_later?
+
     (log.uprn_known.nil? || log.uprn_known.zero?) && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
   end
 
diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
index 5c451e494..f7cef35a7 100644
--- a/app/models/form/sales/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -24,12 +24,12 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
   def uprn_questions
     if form.start_year_2024_or_later?
       [
-        # Form::Sales::Pages::Uprn.new(nil, nil, self),
-        # Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
+        Form::Sales::Pages::Uprn.new(nil, nil, self),
+        Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Sales::Pages::AddressSearch.new(nil, nil, self),
-        # Form::Sales::Pages::AddressMatcher.new(nil, nil, self),
-        # Form::Sales::Pages::NoAddressFound.new(nil, nil, self),
-        # Form::Sales::Pages::UprnSelection.new(nil, nil, self),
+        Form::Sales::Pages::AddressMatcher.new(nil, nil, self),
+        Form::Sales::Pages::NoAddressFound.new(nil, nil, self),
+        Form::Sales::Pages::UprnSelection.new(nil, nil, self),
         Form::Sales::Pages::AddressFallback.new(nil, nil, self),
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
         Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),