diff --git a/src/main/java/com/dangsim/chat/repository/ChatRoomQueryRepositoryImpl.java b/src/main/java/com/dangsim/chat/repository/ChatRoomQueryRepositoryImpl.java
index 68387e3..dd87ee0 100644
--- a/src/main/java/com/dangsim/chat/repository/ChatRoomQueryRepositoryImpl.java
+++ b/src/main/java/com/dangsim/chat/repository/ChatRoomQueryRepositoryImpl.java
@@ -96,6 +96,7 @@ public CursorPageResponse<ChatRoomDetailResponse> findChatMessagesByCursor(Long
 		boolean hasNext = allMessages.size() > size;
 		List<ChatMessageDetailResponse> pageMessages = subLastPage(allMessages, hasNext);
 		String nextCursor = getNextCursorByMessage(pageMessages, hasNext);
+		System.out.println("nextCursor = " + nextCursor);
 
 		ChatRoomDetailResponse detailResponse = new ChatRoomDetailResponse(chatRoomId, pageMessages);
 
@@ -136,7 +137,7 @@ private String getNextCursorByMessage(List<ChatMessageDetailResponse> messages,
 		if (Objects.isNull(messages) || messages.isEmpty() || !hasNext) {
 			return null;
 		}
-		return messages.get(messages.size() - 1).timeStamp();
+		return String.valueOf(messages.get(messages.size() - 1).messageId());
 	}
 
 	private <T> List<T> subLastPage(List<T> list, boolean hasNext) {
diff --git a/src/main/java/com/dangsim/common/config/CorsConfig.java b/src/main/java/com/dangsim/common/config/CorsConfig.java
index 7b47ac1..b7f40a8 100644
--- a/src/main/java/com/dangsim/common/config/CorsConfig.java
+++ b/src/main/java/com/dangsim/common/config/CorsConfig.java
@@ -14,4 +14,4 @@
 // 			}
 // 		};
 // 	}
-// }
+// }
\ No newline at end of file
diff --git a/src/test/java/com/dangsim/task/service/TaskServiceTest.java b/src/test/java/com/dangsim/task/service/TaskServiceTest.java
index 578e055..60f1034 100644
--- a/src/test/java/com/dangsim/task/service/TaskServiceTest.java
+++ b/src/test/java/com/dangsim/task/service/TaskServiceTest.java
@@ -13,9 +13,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.dangsim.payment.entity.PaymentStatus;
-import com.dangsim.pg.repository.PaymentGatewayRepository;
-import com.dangsim.pg.service.PaymentGatewayService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;