diff --git a/src/main/java/com/example/egobook_be/domain/diary/repository/DiaryRepository.java b/src/main/java/com/example/egobook_be/domain/diary/repository/DiaryRepository.java
index 10b9bc7..957d271 100644
--- a/src/main/java/com/example/egobook_be/domain/diary/repository/DiaryRepository.java
+++ b/src/main/java/com/example/egobook_be/domain/diary/repository/DiaryRepository.java
@@ -43,10 +43,11 @@ public interface DiaryRepository extends JpaRepository<Diary, Long> {
     List<DailyEmotionCount> findDailyEmotions(User user, LocalDate start, LocalDate end);
 
     @Query("""
-    SELECT d
-    FROM Diary d
-    WHERE d.user = :user
-      AND d.date = :date
+    SELECT d 
+    FROM Diary d 
+    JOIN d.type t 
+    WHERE d.user = :user 
+      AND d.date = :date 
       AND (:type IS NULL OR :type MEMBER OF d.type)
     ORDER BY d.writtenAt DESC
 """)
diff --git a/src/main/java/com/example/egobook_be/domain/diary/service/DiaryService.java b/src/main/java/com/example/egobook_be/domain/diary/service/DiaryService.java
index 68be885..4997a1a 100644
--- a/src/main/java/com/example/egobook_be/domain/diary/service/DiaryService.java
+++ b/src/main/java/com/example/egobook_be/domain/diary/service/DiaryService.java
@@ -51,8 +51,7 @@ public DiaryCreateResDto createDiary(Long userId, DiaryCreateReqDto dto) {
         // DiaryCreateReqDto 검증
         verifyDiaryReqDto(dto.type(), dto.emotionLevel(), dto.content());
 
-        // 미래 검증
-        if (dto.date().isAfter(LocalDate.now())) {
+        if (dto.date().isAfter(LocalDate.now().plusDays(1))) {
             throw new CustomException(DiaryErrorCode.INVALID_DIARY_DATE);
         }