diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
index 171e2512a..aa057a1de 100644
--- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
@@ -90,19 +90,24 @@ namespace IRaCIS.Core.Application.Contracts
 
             //};
 
-            var criterionList = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.IsEnable == true && t.CriterionTypeList != null)
+            var criterionList = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.IsEnable == true)
+                .Where(t => t.CriterionTypeList != null)
                 .WhereIf(addOrEditEmailNoticeConfig.Id != null, t => t.Id != addOrEditEmailNoticeConfig.Id)
-                .SelectMany(t => t.CriterionTypeList).ToList();
+                .Select(t => t.CriterionTypeList).ToList();
 
 
             if (addOrEditEmailNoticeConfig.CriterionTypeList != null)
             {
                 foreach (var item in addOrEditEmailNoticeConfig.CriterionTypeList)
                 {
-                    if (criterionList.Any(t => t == item))
+                    foreach (var itemList in criterionList)
                     {
-                        return ResponseOutput.NotOk(_localizer["EmailNoticeConfig_RepeatEmailScenario"]);
+                        if (itemList.Any(t => t == item))
+                        {
+                            return ResponseOutput.NotOk(_localizer["EmailNoticeConfig_RepeatEmailScenario"]);
+                        }
                     }
+
                 }
             }