diff --git a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java
index fdc44dbb42..827d9fa4cf 100644
--- a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java
+++ b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientImpl.java
@@ -368,6 +368,7 @@ final class MqttClientImpl implements MqttClient {
         if (channelFuture != null) {
             pendingPublish.setSent(true);
             if (channelFuture.cause() != null) {
+                this.pendingPublishes.remove(pendingPublish.getMessageId());
                 future.setFailure(channelFuture.cause());
                 return future;
             }