diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index 663caa07..9bab25b6 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -2454,7 +2454,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
             boolean isExpired = false;
             if (!canRecall && message.getFromUser().equals(operatorId)) {
-                if (now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
+                if (mRecallTimeLimit > 0 && now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
                     isExpired = true;
                 } else {
                     canRecall = true;