diff --git a/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/persist/MessageDao.java b/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/persist/MessageDao.java
index 11331fb..2b38daa 100644
--- a/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/persist/MessageDao.java
+++ b/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/persist/MessageDao.java
@@ -3,8 +3,6 @@ package com.ccsens.ccmq.lowlevel.persist;
 import com.ccsens.ccmq.lowlevel.message.common.InMessage;
 import com.ccsens.ccmq.lowlevel.message.common.Message;
 import com.ccsens.ccmq.lowlevel.message.common.MessageConstant;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -14,6 +12,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Repository;
 import wiki.tall.ccmq.common.util.DateUtil;
+import wiki.tall.ccmq.common.util.WebConstant;
 
 import java.util.List;
 
@@ -141,7 +140,9 @@ public class MessageDao implements IMessageDao {
     public List<Message> getClientPendingMessage(MessageConstant.DomainType toDomain, String to, Integer maxMessageNum) {
         Query query = clientPendingMessageQuery(toDomain,to)
                 .with(Sort.by(Sort.Order.asc("time")));
-        if(maxMessageNum == null || maxMessageNum.intValue() == 0) {
+        if(maxMessageNum == null || maxMessageNum.intValue() <= 0) {
+            query.limit(WebConstant.PAGE_SIZE_MAX);
+        } else {
             query.limit(maxMessageNum);
         }
         return mongoTemplate.find(query,Message.class,COLLECTION_MESSAGE);
diff --git a/ccmq/src/main/java/wiki/tall/ccmq/common/util/WebConstant.java b/ccmq/src/main/java/wiki/tall/ccmq/common/util/WebConstant.java
index ece2c29..a6b9184 100644
--- a/ccmq/src/main/java/wiki/tall/ccmq/common/util/WebConstant.java
+++ b/ccmq/src/main/java/wiki/tall/ccmq/common/util/WebConstant.java
@@ -42,6 +42,8 @@ public class WebConstant {
     /**消息队列的queue name 对应的key*/
     public static final String REDIS_QUEUE = "message_queue";
 
+    public static final int PAGE_SIZE_MAX = 50;
+
     public enum QueueAdd{
         FAIL(0,"失败"),SUCCESS(1,"成功"), EXISTED(2, "已存在");
         public int value;