diff --git a/click-service/src/main/java/clickme/clickme/history/application/ClickCountHistoryService.java b/click-service/src/main/java/clickme/clickme/history/application/ClickCountHistoryService.java
index 2c433ff..c758ab3 100644
--- a/click-service/src/main/java/clickme/clickme/history/application/ClickCountHistoryService.java
+++ b/click-service/src/main/java/clickme/clickme/history/application/ClickCountHistoryService.java
@@ -11,36 +11,40 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 @Service
 @RequiredArgsConstructor
 public class ClickCountHistoryService {
 
     private final ClickCountHistoryRepository clickCountHistoryRepository;
+
     public ClickCountHistoriesResponse findClickCountHistoryByNameAndDateBetween(final String name) {
         final LocalDate endDate = LocalDate.now().minusDays(1);
         final LocalDate startDate = endDate.minusDays(6);
 
         final List<ClickCountHistory> histories = clickCountHistoryRepository
                 .findClickCountHistoryByNameAndDateBetweenOrderByDate(name, startDate, endDate);
+
         final Map<LocalDate, Long> dateToClickCount = mapHistoriesToClickCount(histories);
-        List<ClickCountHistoryResponse> responses = buildResponse(startDate, dateToClickCount);
+        final List<ClickCountHistoryResponse> responses = buildResponse(startDate, endDate, dateToClickCount);
 
         return new ClickCountHistoriesResponse(responses);
     }
 
-    private static Map<LocalDate, Long> mapHistoriesToClickCount(final List<ClickCountHistory> histories) {
+    private Map<LocalDate, Long> mapHistoriesToClickCount(final List<ClickCountHistory> histories) {
         return histories.stream()
                 .collect(Collectors.toMap(
                         ClickCountHistory::getDate,
-                        ClickCountHistory::getClickCount)
-                );
+                        ClickCountHistory::getClickCount
+                ));
     }
 
-    private static List<ClickCountHistoryResponse> buildResponse(final LocalDate startDate, final Map<LocalDate, Long> dateToClickCount) {
-        return IntStream.rangeClosed(0, 6)
-                .mapToObj(startDate::plusDays)
+    private List<ClickCountHistoryResponse> buildResponse(
+            final LocalDate startDate,
+            final LocalDate endDate,
+            final Map<LocalDate, Long> dateToClickCount
+    ) {
+        return startDate.datesUntil(endDate.plusDays(1))
                 .map(date -> new ClickCountHistoryResponse(date, dateToClickCount.getOrDefault(date, 0L)))
                 .toList();
     }