diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/AgreementApiServiceImpl.scala b/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/AgreementApiServiceImpl.scala
index 26558ed3..2f106386 100644
--- a/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/AgreementApiServiceImpl.scala
+++ b/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/AgreementApiServiceImpl.scala
@@ -632,9 +632,10 @@ final case class AgreementApiServiceImpl(
       for {
         consumer <- tenantManagementService
           .getTenantById(agreement.consumerId)
-        _        <- Future
-          .failed(ConsumerWithNotValidEmail(agreement.id, agreement.consumerId))
-          .whenA(consumer.mails.filter(_.kind == PersistentTenantMailKind.ContactEmail).isEmpty)
+        _        <-
+          if (consumer.mails.filter(_.kind == PersistentTenantMailKind.ContactEmail).isEmpty)
+            Future.failed(ConsumerWithNotValidEmail(agreement.id, agreement.consumerId))
+          else Future.unit
       } yield ()
 
     def createContractAndSendMail(