diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 909a0aebe..1eb9078ff 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -824,11 +824,11 @@ class LettingsLog < Log
   def is_address_asked?
     return false if scheme_has_confidential_information?
 
-    form.start_year_2026_or_later? || !is_supported_housing?
+    form.start_year_2026_or_later? || is_general_needs?
   end
 
   def scheme_has_confidential_information?
-    scheme&.has_confidential_information? || false
+    !!scheme&.has_confidential_information?
   end
 
   def referral_is_from_local_authority_housing_register?
diff --git a/app/services/bulk_upload/lettings/year2026/row_parser.rb b/app/services/bulk_upload/lettings/year2026/row_parser.rb
index 96b7a23d7..ed9745139 100644
--- a/app/services/bulk_upload/lettings/year2026/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2026/row_parser.rb
@@ -1584,7 +1584,7 @@ private
   end
 
   def scheme_has_confidential_information?
-    scheme&.has_confidential_information? || false
+    !!scheme&.has_confidential_information?
   end
 
   def location