diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 5e84f06dc..f650c0ff2 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -184,7 +184,7 @@ class LettingsLog < Log
   end
 
   def la
-    if (!form.start_year_2026_or_later? && location) || (form.start_year_2026_or_later? && !super)
+    if location && (!form.start_year_2026_or_later? || (form.start_year_2026_or_later? && !super))
       location.linked_local_authorities.active(form.start_date).first&.code || location.location_code
     else
       super
@@ -192,7 +192,7 @@ class LettingsLog < Log
   end
 
   def postcode_full
-    if (!form.start_year_2026_or_later? && location) || (form.start_year_2026_or_later? && !super)
+    if location && (!form.start_year_2026_or_later? || (form.start_year_2026_or_later? && !super))
       location.postcode
     else
       super