diff --git a/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java b/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java
index 35457ac..f31d0a0 100644
--- a/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java
+++ b/peakup-backend/src/main/java/com/peakup/goal/dao/GoalMetricPeriodTotalDAO.java
@@ -77,7 +77,7 @@ public class GoalMetricPeriodTotalDAO extends AbstractDAO<GoalMetricPeriodTotal>
                 cb.equal(root.get(GoalMetricPeriodTotal_.athleteId), athleteId),
                 cb.equal(root.get(GoalMetricPeriodTotal_.metric), metric),
                 cb.equal(root.get(GoalMetricPeriodTotal_.isoWeekYear), isoWeekYear),
-                cb.equal(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek),
+                cb.lessThanOrEqualTo(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek),
                 cb.equal(root.get(GoalMetricPeriodTotal_.year), year),
                 cb.equal(root.get(GoalMetricPeriodTotal_.month), month)
         );
@@ -98,7 +98,7 @@ public class GoalMetricPeriodTotalDAO extends AbstractDAO<GoalMetricPeriodTotal>
                 cb.equal(root.get(GoalMetricPeriodTotal_.athleteId), athleteId),
                 cb.equal(root.get(GoalMetricPeriodTotal_.metric), metric),
                 cb.equal(root.get(GoalMetricPeriodTotal_.isoWeekYear), isoWeekYear),
-                cb.equal(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek),
+                cb.lessThanOrEqualTo(root.get(GoalMetricPeriodTotal_.calendarWeek), calendarWeek),
                 cb.equal(root.get(GoalMetricPeriodTotal_.year), year)
         );
         final Double result = em.createQuery(cq).getSingleResult();