diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
index 64df68cb..30d67746 100755
--- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
@@ -451,7 +451,7 @@ public class MessagesPublisher {
         WFCMessage.Message message = m_messagesStore.getMessage(messageHead);
 
         if (message != null) {
-            message = message.toBuilder().setMessageId(0).setServerTimestamp(0).build();
+            message = message.toBuilder().setMessageId(0).build();
             for (String user : receivers) {
                 Collection<Session> sessions = m_sessionsStore.sessionForUser(user);