diff --git a/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomCustomRepository.java b/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomCustomRepository.java
index f6d5d3d9..49e3a109 100644
--- a/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomCustomRepository.java
+++ b/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomCustomRepository.java
@@ -8,4 +8,6 @@
 public interface ChatRoomCustomRepository {
     Optional<Long> findChatRoomIdByRequestUserIdAndRecordId(Long requestUserId, Long recordId);
     List<ChatRoom> findByRequestUserIdOrderByCreatedAtDesc(Long userId);
+    List<ChatRoom> findChatRoomsByUserId(Long userId);
+
 }
diff --git a/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomRepositoryImpl.java b/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomRepositoryImpl.java
index d9ef0e95..4d91849e 100644
--- a/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomRepositoryImpl.java
+++ b/src/main/java/org/dfbf/soundlink/domain/chat/repository/ChatRoomRepositoryImpl.java
@@ -5,6 +5,7 @@
 import org.dfbf.soundlink.domain.chat.entity.ChatRoom;
 import org.dfbf.soundlink.domain.chat.entity.QChatRoom;
 import org.dfbf.soundlink.domain.emotionRecord.entity.EmotionRecord;
+import org.dfbf.soundlink.domain.emotionRecord.entity.QEmotionRecord;
 import org.dfbf.soundlink.domain.user.entity.QProfileMusic;
 import org.dfbf.soundlink.domain.user.entity.QUser;
 import org.dfbf.soundlink.domain.user.entity.User;
@@ -40,4 +41,19 @@ public List<ChatRoom> findByRequestUserIdOrderByCreatedAtDesc(Long userId) {
                 .orderBy(QChatRoom.chatRoom.createdAt.desc())
                 .fetch();
     }
+
+    @Override
+    public List<ChatRoom> findChatRoomsByUserId(Long userId) {
+        return queryFactory
+                .selectFrom(QChatRoom.chatRoom)
+                .leftJoin(QChatRoom.chatRoom.recordId, QEmotionRecord.emotionRecord)  // ChatRoom과 EmotionRecord를 left join
+                .leftJoin(QEmotionRecord.emotionRecord.user, QUser.user)  // EmotionRecord와 User를 left join
+                .where(
+                        QChatRoom.chatRoom.requestUserId.userId.eq(userId) // 요청자 userId 기준
+                                .or(QUser.user.userId.eq(userId)) // 응답자 userId 기준
+                )
+                .orderBy(QChatRoom.chatRoom.createdAt.desc()) // 생성일 기준 내림차순 정렬
+                .fetch();
+    }
+
 }
diff --git a/src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java b/src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java
index d0ee5904..207103b5 100644
--- a/src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java
+++ b/src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java
@@ -146,7 +146,7 @@ public ResponseResult deleteRequestFromRedis(Long userId, Long emotionRecordId)
             return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
         } catch (Exception e) {
             log.error(e.getMessage());
-            return new ResponseResult(400, "Chat request failed.");
+            return new ResponseResult(400, "Failed to delete the chat request.");
         }
     }
 
@@ -182,7 +182,7 @@ public ResponseResult requestRejected(Long responseUserId, ChatRejectDto chatRej
             return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER);
         } catch (Exception e) {
             log.error(e.getMessage());
-            return new ResponseResult(400, "Chat request failed.");
+            return new ResponseResult(400, "Failed to reject the chat request.");
         }
     }
 
@@ -297,7 +297,7 @@ public ResponseResult closeChatRoom(@AuthenticationPrincipal Long userId, Long c
     //채팅방 목록 불러오기
     public ResponseResult getChatRoomList(@AuthenticationPrincipal Long userId) {
         try {
-            List<ChatRoom> chatRooms = chatRoomRepository.findByRequestUserIdOrderByCreatedAtDesc(userId);
+            List<ChatRoom> chatRooms = chatRoomRepository.findChatRoomsByUserId(userId);
 
             List<ChatRoomListDto> chatRoomList = chatRooms.stream()
                     .map(chatRoom -> new ChatRoomListDto(
diff --git a/src/test/java/org/dfbf/soundlink/domain/chatRoom/ChatRoomServiceTest.java b/src/test/java/org/dfbf/soundlink/domain/chatRoom/ChatRoomServiceTest.java
index 5e5b91af..0cbaccc6 100644
--- a/src/test/java/org/dfbf/soundlink/domain/chatRoom/ChatRoomServiceTest.java
+++ b/src/test/java/org/dfbf/soundlink/domain/chatRoom/ChatRoomServiceTest.java
@@ -307,7 +307,7 @@ void testGetChatRoomList() {
 
         List<ChatRoom> mockChatRooms = List.of(mockChatRoom);
 
-        when(chatRoomRepository.findByRequestUserIdOrderByCreatedAtDesc(userId)).thenReturn(mockChatRooms);
+        when(chatRoomRepository.findChatRoomsByUserId(userId)).thenReturn(mockChatRooms);
 
         //when
         ResponseResult result = chatRoomService.getChatRoomList(userId);