diff --git a/src/main/java/com/umc/mada/timetable/controller/TimetableController.java b/src/main/java/com/umc/mada/timetable/controller/TimetableController.java
index 1f91e11..2c40e60 100644
--- a/src/main/java/com/umc/mada/timetable/controller/TimetableController.java
+++ b/src/main/java/com/umc/mada/timetable/controller/TimetableController.java
@@ -73,10 +73,16 @@ public ResponseEntity<Map<String, Object>> getUserTimetableComment(Authenticatio
         Optional<User> userOptional = userRepository.findByAuthId(authentication.getName());
         User user = userOptional.get();
         CommentResponseDto userComment = timetableService.getUserComment(user, date);
-        Map<String, Object> data = new LinkedHashMap<>();
-        data.put("Comment", userComment);
         Map<String, Object> result = new LinkedHashMap<>();
-        result.put("data", data);
+
+        if (userComment != null) {
+            Map<String, Object> data = new LinkedHashMap<>();
+            data.put("Comment", userComment);
+            result.put("data", data);  // comment가 있으면 data를 추가
+        } else {
+            result.put("data", null);  // comment가 없으면 data를 null로 설정
+        }
+
         return ResponseEntity.ok().body(result);
     }
 
diff --git a/src/main/java/com/umc/mada/timetable/service/TimetableService.java b/src/main/java/com/umc/mada/timetable/service/TimetableService.java
index d556c16..af4b17f 100644
--- a/src/main/java/com/umc/mada/timetable/service/TimetableService.java
+++ b/src/main/java/com/umc/mada/timetable/service/TimetableService.java
@@ -298,10 +298,9 @@ public CommentResponseDto updateComment (User user, LocalDate date, CommentReque
     // 특정 유저 comment 조회 로직
     public CommentResponseDto getUserComment(User user, LocalDate date) {
         validateUserId(user);
-
         Comment comment = commentRepository.findCommentByUserIdAndDateIs(user, date)
-                .orElseThrow(() -> new IllegalArgumentException("NOT_FOUND_ERROR"));
-
+                .orElse(null);
+        if (comment == null) {return null;}
         return new CommentResponseDto(comment.getId(), comment.getDate(), comment.getContent());
     }