diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index 78f3e491..c53a3525 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -847,6 +847,10 @@ public class MemoryMessagesStore implements IMessagesStore {
             mReadLock.unlock();
         }
 
+        if(current == 0) {
+            current = 2;
+            head = 2;
+        }
         builder.setCurrent(current);
         builder.setHead(head);
         return builder.build();
@@ -1000,7 +1004,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 messageSeq = maxPullSeq + 1;
             }
 
-            if (messageSeq == 0) {
+            if (messageSeq < messageId) {
                 messageSeq = messageId;
             }