diff --git a/lambdas/services/bulk_upload_service.py b/lambdas/services/bulk_upload_service.py
index cf8ffcdf8..30dcc3581 100644
--- a/lambdas/services/bulk_upload_service.py
+++ b/lambdas/services/bulk_upload_service.py
@@ -131,13 +131,13 @@ def handle_sqs_message(self, message: dict):
                 file_metadata.scan_date = validate_scan_date(file_metadata.scan_date)
             request_context.patient_nhs_no = staging_metadata.nhs_number
             validate_nhs_number(staging_metadata.nhs_number)
-            validate_lg_file_names(file_names, staging_metadata.nhs_number)
             pds_patient_details = getting_patient_info_from_pds(
                 staging_metadata.nhs_number
             )
             patient_ods_code = (
                 pds_patient_details.get_ods_code_or_inactive_status_for_gp()
             )
+            validate_lg_file_names(file_names, staging_metadata.nhs_number)
 
             if not self.bypass_pds:
                 if not self.strict_mode:
diff --git a/lambdas/tests/unit/services/test_bulk_upload_service.py b/lambdas/tests/unit/services/test_bulk_upload_service.py
index 6436d6f15..6f8ca4593 100644
--- a/lambdas/tests/unit/services/test_bulk_upload_service.py
+++ b/lambdas/tests/unit/services/test_bulk_upload_service.py
@@ -378,7 +378,7 @@ def test_handle_sqs_message_calls_report_upload_failure_when_patient_record_alre
     mock_create_lg_records_and_copy_files.assert_not_called()
     mock_remove_ingested_file_from_source_bucket.assert_not_called()
     mock_report_upload_failure.assert_called_with(
-        TEST_STAGING_METADATA, UploadStatus.FAILED, str(mocked_error), ""
+        TEST_STAGING_METADATA, UploadStatus.FAILED, str(mocked_error), "Y12345"
     )
     repo_under_test.sqs_repository.send_message_to_pdf_stitching_queue.assert_not_called()
 
@@ -416,7 +416,7 @@ def test_handle_sqs_message_calls_report_upload_failure_when_lg_file_name_invali
         TEST_STAGING_METADATA_WITH_INVALID_FILENAME,
         UploadStatus.FAILED,
         str(mocked_error),
-        "",
+        "Y12345"
     )
     repo_under_test.sqs_repository.send_message_to_pdf_stitching_queue.assert_not_called()