diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 2f52923e63..4460e16b60 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -929,9 +929,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 gatewaySessionHandler.onGatewayDisconnect();
             }
             deviceSessionCtx.setDisconnected();
-            context.onAuthFailure(address);
-            ChannelHandlerContext ctx = deviceSessionCtx.getChannel();
-            ctx.close();
         }
         deviceSessionCtx.release();
     }
@@ -1073,6 +1070,9 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     @Override
     public void onDeviceDeleted(DeviceId deviceId) {
         doDisconnect();
+        context.onAuthFailure(address);
+        ChannelHandlerContext ctx = deviceSessionCtx.getChannel();
+        ctx.close();
     }
 
 }