diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailDao.java
index 66b20b77..df5566e0 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailDao.java
@@ -72,18 +72,18 @@ public class EmailDao {
 
     public EmailSendResponse buildEmailSendResponseFromRequest(HttpServletRequest request) {
         Long userActionId = (Long) request.getAttribute(GepafinConstant.USER_ACTION_ID);
-        List<EmailLogEntity> emailLogs = emailLogRepository.findByUserActionId(userActionId);
+        List<EmailLogEntity> emailLogs = emailLogRepository.findByUserActionIdAndEmailServiceType(userActionId,EmailServiceTypeEnum.PEC_SERVICE.getValue());
 
         boolean allSuccess = true;
         String emailScenario = null;
 
         for (EmailLogEntity log : emailLogs) {
+
             if (emailScenario == null) {
                 emailScenario = log.getEmailType();
             }
-            boolean isSuccess = EmailServiceTypeEnum.PEC_SERVICE.getValue().equals(log.getEmailServiceType()) &&
-                    StatusTypeEnum.SUCCESS.getValue().equals(log.getSendStatus());
-            if (!isSuccess) {
+            boolean isSuccess = StatusTypeEnum.SUCCESS.getValue().equals(log.getSendStatus());
+            if (Boolean.FALSE.equals(isSuccess)) {
                 allSuccess = false;
                 break;
             }
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java
index f12d0e3b..669c4b69 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/EmailLogRepository.java
@@ -14,5 +14,8 @@ public interface EmailLogRepository extends JpaRepository<EmailLogEntity,Long> {
     List<EmailLogEntity> findByUserActionIdAndEmailServiceTypeAndSendStatus(
             Long userActionId, String emailServiceType, String sendStatus);
     Optional<EmailLogEntity> findTopByUserIdAndEmailTypeAndIsDeletedFalseOrderByCreatedDateDesc(Long userId, String emailType);
+    List<EmailLogEntity> findByUserActionIdAndEmailServiceType(
+            Long userActionId, String emailServiceType);
+
 
 }