diff --git a/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportService.cs b/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportService.cs
index 03a19c44..0e364319 100644
--- a/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportService.cs
+++ b/AsbCloudInfrastructure/Services/AutoGeneratedDailyReports/AutoGeneratedDailyReportService.cs
@@ -66,8 +66,6 @@ public class AutoGeneratedDailyReportService : IAutoGeneratedDailyReportService
 		
 		if (datesRange is null)
 			return result;
-
-        result.Count = (int)(Math.Ceiling((datesRange.To - DateTime.UnixEpoch).TotalDays) - Math.Floor((datesRange.From - DateTime.UnixEpoch).TotalDays));
 		
 		if (request.StartDate.HasValue)
 		{
@@ -87,6 +85,9 @@ public class AutoGeneratedDailyReportService : IAutoGeneratedDailyReportService
 				datesRange.To = finishDate;
 		}
 
+		if (datesRange.From.AddDays(result.Skip) <= datesRange.To)
+			result.Count = (int)(Math.Ceiling((datesRange.To - DateTime.UnixEpoch).TotalDays) - Math.Floor((datesRange.From - DateTime.UnixEpoch).TotalDays));
+
 		for (int day = result.Skip; (day - result.Skip) < result.Take && (datesRange.From.AddDays(day)) <= datesRange.To; day++)
 		{
 			var reportDate = DateOnly.FromDateTime(datesRange.From.AddDays(day));
@@ -149,8 +150,8 @@ public class AutoGeneratedDailyReportService : IAutoGeneratedDailyReportService
 		
 		return new DatesRangeDto
 		{
-			From = factOperations.Min(o => o.DateStart),
-			To = factOperations.Max(o => o.DateStart)
+			From = factOperations.Min(o => o.DateStart).Date,
+			To = factOperations.Max(o => o.DateStart).Date
 		};
 	}