diff --git a/src/main/java/com/brainpix/message/repository/MessageRepository.java b/src/main/java/com/brainpix/message/repository/MessageRepository.java
index b0cb52c..2857ec4 100644
--- a/src/main/java/com/brainpix/message/repository/MessageRepository.java
+++ b/src/main/java/com/brainpix/message/repository/MessageRepository.java
@@ -7,8 +7,8 @@
 import com.brainpix.message.model.Message;
 
 public interface MessageRepository extends MongoRepository<Message, String> {
+	Page<Message> findByReceiverIdOrSenderId(Long senderId, Long receiverId, Pageable pageable);
 	Page<Message> findAllByReceiverId(Long receiverId, Pageable pageable);
-	Page<Message> findAllByReceiverIdAndIsRead(Long receiverId, Boolean isRead, Pageable pageable);
 	Page<Message> findAllBySenderId(Long senderId, Pageable pageable);
 	Long countAllByReceiverIdAndIsRead(Long receiverId, Boolean isRead);
 }
diff --git a/src/main/java/com/brainpix/message/service/MessageService.java b/src/main/java/com/brainpix/message/service/MessageService.java
index 5865a7f..45e086b 100644
--- a/src/main/java/com/brainpix/message/service/MessageService.java
+++ b/src/main/java/com/brainpix/message/service/MessageService.java
@@ -122,7 +122,7 @@ private User getUser(Long userId, ErrorCode errorCode) {
 	private Page<Message> getMessageListBySearchType(Long userId, MessageSearchType searchType,
 		PageRequest pageRequest) {
 		if (searchType == MessageSearchType.ALL) {
-			return messageRepository.findAllByReceiverId(userId, pageRequest);
+			return messageRepository.findByReceiverIdOrSenderId(userId, userId, pageRequest);
 		} else if (searchType == MessageSearchType.SEND) {
 			return messageRepository.findAllBySenderId(userId, pageRequest);
 		} else if (searchType == MessageSearchType.RECEIVED) {