diff --git a/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java b/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
index f70c08aa..7e632ea8 100644
--- a/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
+++ b/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
@@ -20,11 +20,11 @@ class BestEffortMessageSender {
         this.connectionDescriptors = connectionDescriptors;
     }
 
-    void publishQos0(ClientSession clientsession, String topic, ByteBuffer message, PublishMessage pubMessage) {
+    void publishQos0(ClientSession clientsession, PublishMessage pubMessage) {
         String clientId = clientsession.clientID;
-        LOG.info("send publish message to <{}> on topic <{}>", clientId, topic);
+        LOG.info("send publish message to <{}> on topic <{}>", clientId, pubMessage.getTopicName());
         if (LOG.isDebugEnabled()) {
-            LOG.debug("content <{}>", DebugUtils.payload2Str(message));
+            LOG.debug("content <{}>", DebugUtils.payload2Str(pubMessage.getPayload()));
         }
 
         if (connectionDescriptors == null) {
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 f04c48c9..26e82557 100644
--- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
@@ -62,7 +62,7 @@ class MessagesPublisher {
                 //QoS 0
                 if (qos == AbstractMessage.QOSType.MOST_ONE) {
                     PublishMessage publishMsg = BestEffortMessageSender.createPublishForQos(topic, MOST_ONE, message);
-                    this.bestEffortSender.publishQos0(targetSession, topic, message, publishMsg);
+                    this.bestEffortSender.publishQos0(targetSession, publishMsg);
                 } else {
                     //QoS 1 or 2
                     int messageId = targetSession.nextPacketId();
diff --git a/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java b/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
index 640d3f6b..5aca1047 100644
--- a/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
+++ b/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
@@ -1,6 +1,5 @@
 package io.moquette.spi.impl;
 
-import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.server.ConnectionDescriptor;
 import io.moquette.spi.ClientSession;
@@ -8,7 +7,6 @@ import io.netty.channel.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.ByteBuffer;
 import java.util.concurrent.ConcurrentMap;
 
 class PersistentQueueMessageSender {