diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb
index 1c4e643f9..6123e4954 100644
--- a/app/services/bulk_upload/sales/year2023/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2023/row_parser.rb
@@ -509,12 +509,14 @@ class BulkUpload::Sales::Year2023::RowParser
       fields = field_mapping_for_errors[error.attribute] || []
 
       fields.each do |field|
-        unless errors.include?(field)
-          if error.attribute == :owning_organisation_id || error.attribute == :managing_organisation_id || error.attribute == :saledate
-            errors.add(field, error.message, category: :setup)
-          else
-            errors.add(field, error.message)
-          end
+        next if errors.include?(field)
+
+        question = log.form.get_question(error.attribute, log)
+
+        if setup_question?(question)
+          errors.add(field, error.message, category: :setup)
+        else
+          errors.add(field, error.message)
         end
       end
     end