diff --git a/src/main/java/org/jullaene/walkmong_back/api/chat/service/ChatRoomService.java b/src/main/java/org/jullaene/walkmong_back/api/chat/service/ChatRoomService.java
index 5f73f48..0489983 100644
--- a/src/main/java/org/jullaene/walkmong_back/api/chat/service/ChatRoomService.java
+++ b/src/main/java/org/jullaene/walkmong_back/api/chat/service/ChatRoomService.java
@@ -227,7 +227,7 @@ else if (board.getWalkingStatus().equals(WalkingStatus.PENDING) && board.getStar
                         .orElseThrow(() -> new CustomException(HttpStatus.NOT_FOUND, ErrorType.INVALID_DOG));
 
                 Chat chat = chatRepository.findFirstByRoomIdAndDelYnOrderByCreatedAtDesc(chatRoom.getRoomId(), "N")
-                        .orElseThrow(null);
+                        .orElse(null);
 
                 ChatRoomListResponseDto chatRoomListResponseDto = ChatRoomListResponseDto.builder()
                         .tabStatus(TabStatus.BOARD)