diff --git a/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java b/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java
index 10c0160..aae1222 100644
--- a/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java
+++ b/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java
@@ -46,13 +46,16 @@ public HabitReportResponseDto getHabitReport(Long memberId, int year, int month)
         // 주별 활동 횟수
         List<Object[]> weeklyHabitCountsData = habitHistoryRepository.getWeeklyHabitCounts(memberId, year, month);
         List<HabitReportResponseDto.WeeklyData> weeklyHabitCounts = weeklyHabitCountsData.stream()
-                .map(data -> new HabitReportResponseDto.WeeklyData(
-                        ((Number) data[0]).intValue(), // 주차
-                        ((Number) data[1]).longValue(), // 습관 ID
-                        ((Number) data[2]).longValue() // 활동 횟수
-                ))
+                .map(data -> {
+                    int week = data[0] != null ? ((Number) data[0]).intValue() : 0; // 주차
+                    long habitId = data[1] != null ? ((Number) data[1]).longValue() : 0L; // 습관 ID
+                    long count = data[2] != null ? ((Number) data[2]).longValue() : 0L; // 활동 횟수
+
+                    return new HabitReportResponseDto.WeeklyData(week, habitId, count);
+                })
                 .collect(Collectors.toList());
 
+
         return new HabitReportResponseDto(recordPercentage, achievementGrowth, topHabit, weeklyAchievementRates, weeklyActiveTime,weeklyHabitCounts);
     }
 }