diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb
index 4ad082174..e25ad5645 100644
--- a/app/services/exports/lettings_log_export_service.rb
+++ b/app/services/exports/lettings_log_export_service.rb
@@ -169,5 +169,11 @@ module Exports
 
       xml_doc_to_temp_file(doc)
     end
+
+    def collection_years_to_export(collection_year)
+      return [collection_year] if collection_year.present?
+
+      FormHandler.instance.lettings_forms.values.map { |f| f.start_date.year }.uniq
+    end
   end
 end
diff --git a/app/services/exports/xml_export_service.rb b/app/services/exports/xml_export_service.rb
index f5ba69505..009a1b306 100644
--- a/app/services/exports/xml_export_service.rb
+++ b/app/services/exports/xml_export_service.rb
@@ -93,11 +93,5 @@ module Exports
 
       xml_doc_to_temp_file(doc)
     end
-
-    def collection_years_to_export(collection_year)
-      return [collection_year] if collection_year.present?
-
-      FormHandler.instance.lettings_forms.values.map { |f| f.start_date.year }.uniq
-    end
   end
 end
diff --git a/lib/tasks/data_export.rake b/lib/tasks/data_export.rake
index 903806b78..7a9a90bc8 100644
--- a/lib/tasks/data_export.rake
+++ b/lib/tasks/data_export.rake
@@ -7,8 +7,10 @@ namespace :core do
   end
 
   desc "Export all data XMLs for import into Central Data System (CDS)"
-  task :full_data_export_xml, %i[year] => :environment do |_task, args|
-    collection = args[:year].present? ? args[:year].to_i : nil
+  task :full_data_export_xml, %i[collection] => :environment do |_task, args|
+    collection = args[:collection].presence
+    collection = collection.to_i if collection.present? && collection.scan(/\D/).empty?
+
     storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["EXPORT_BUCKET"])
     export_service = Exports::ExportService.new(storage_service)