diff --git a/mail/libraries/data_processors.py b/mail/libraries/data_processors.py
index 267db126..181bcf1b 100644
--- a/mail/libraries/data_processors.py
+++ b/mail/libraries/data_processors.py
@@ -109,7 +109,7 @@ def get_mail_instance(extract_type, run_number) -> Mail or None:
             logging.info("Licence update reply has already been processed")
             return
         return find_mail_of(
-            [ExtractTypeEnum.LICENCE_DATA, ExtractTypeEnum.LICENCE_REPLY], ReceptionStatusEnum.REPLY_PENDING
+            [ExtractTypeEnum.LICENCE_DATA, ExtractTypeEnum.LICENCE_REPLY], ReceptionStatusEnum.REPLY_PENDING, run_number
         )
     elif extract_type == ExtractTypeEnum.USAGE_REPLY:
         last_email = UsageData.objects.filter(spire_run_number=run_number).last()
diff --git a/mail/libraries/mailbox_service.py b/mail/libraries/mailbox_service.py
index 2ce511f2..73a37619 100644
--- a/mail/libraries/mailbox_service.py
+++ b/mail/libraries/mailbox_service.py
@@ -181,9 +181,9 @@ def read_last_three_emails(pop3connection: POP3_SSL) -> list:
     return email_message_dtos
 
 
-def find_mail_of(extract_types: List[str], reception_status: str) -> Mail or None:
+def find_mail_of(extract_types: List[str], reception_status: str, hmrc_run_number) -> Mail or None:
     try:
-        mail = Mail.objects.get(status=reception_status, extract_type__in=extract_types)
+        mail = Mail.objects.get(status=reception_status, extract_type__in=extract_types, hmrc_run_number=hmrc_run_number)
     except Mail.DoesNotExist:
         logging.warning("Can not find any mail in [%s] of extract type [%s]", reception_status, extract_types)
         return