diff --git a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/message/MessageIdService.java b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/message/MessageIdService.java
index 06d79e8..000eb1c 100644
--- a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/message/MessageIdService.java
+++ b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/message/MessageIdService.java
@@ -19,7 +19,9 @@ public class MessageIdService implements IMessageIdService {
     @Override
     public int getNextMessageId() {
         try {
-            nextMsgId = (int) (redisService.incr("mqttwk:messageid:num") % 65535);
+            nextMsgId = (int) (redisService.incr("mqttwk:messageid:num") % 65536);
+            if (nextMsgId == 0)
+                return this.getNextMessageId();
         } catch (Exception e) {
             e.printStackTrace();
         }