diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 8d626d20..7bc3b151 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1070,26 +1070,38 @@ namespace BMA.EHR.Leave.Service.Controllers
                 fiscalYear = req.StartLeaveDate.Year + 1;
 
             var sumLeaveDay = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(fiscalYear, req.Type, userId);
-
-
-            var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
-                                                                          (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
-                                                                          x.KeycloakUserId == userId)
-                                                                 .OrderBy(x => x.LeaveStartDate)
-                                                                 .FirstOrDefaultAsync());
-
-            var maxLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
-                                                                          (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
-                                                                          x.KeycloakUserId == userId)
-                                                                 .OrderByDescending(x => x.LeaveEndDate)
-                                                                 .FirstOrDefaultAsync());
-
             var isBetween = false;
-            if (minLeave != null && maxLeave != null)
-            {
-                isBetween = (req.StartLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.StartLeaveDate.Date <= maxLeave.LeaveEndDate.Date) ||
-                            (req.EndLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.EndLeaveDate.Date <= maxLeave.LeaveEndDate.Date);
-            }
+            var existingLeaves = await _context.Set<LeaveRequest>()
+                .Where(x => x.Type.Id == req.Type &&
+                            (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
+                            x.KeycloakUserId == userId)
+                .ToListAsync();
+
+            isBetween = existingLeaves.Any(leave => 
+                            req.StartLeaveDate.Date <= leave.LeaveEndDate.Date && 
+                            req.EndLeaveDate.Date >= leave.LeaveStartDate.Date);
+
+            // var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
+            //                                                               (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
+            //                                                               x.KeycloakUserId == userId)
+            //                                                      .OrderBy(x => x.LeaveStartDate)
+            //                                                      .FirstOrDefaultAsync());
+
+            // var maxLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
+            //                                                               (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
+            //                                                               x.KeycloakUserId == userId)
+            //                                                      .OrderByDescending(x => x.LeaveEndDate)
+            //                                                      .FirstOrDefaultAsync());
+
+            // var isBetween = false;
+            // if (minLeave != null && maxLeave != null)
+            // {
+            //     // isBetween = (req.StartLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.StartLeaveDate.Date <= maxLeave.LeaveEndDate.Date) ||
+            //     //             (req.EndLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.EndLeaveDate.Date <= maxLeave.LeaveEndDate.Date);
+            //     isBetween = req.StartLeaveDate.Date <= maxLeave.LeaveEndDate.Date && 
+            //                 req.EndLeaveDate.Date >= minLeave.LeaveStartDate.Date;
+
+            // }
 
             var isLeave = false;
             var approveDay = sumLeaveDay == null ? 0.0 : sumLeaveDay.LeaveDaysUsed;