diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 5effd2b497..ed0c8c642c 100644
--- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -255,18 +255,14 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                         break;
                     }
                     case DEVICE_RPC_RESPONSE_SUB_TOPIC:
+                    case GATEWAY_ATTRIBUTES_TOPIC:
+                    case GATEWAY_RPC_TOPIC:
                         registerSubQoS(topic, grantedQoSList, reqQoS);
                         break;
                     case DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
                         deviceSessionCtx.setAllowAttributeResponses();
                         registerSubQoS(topic, grantedQoSList, reqQoS);
                         break;
-                    case GATEWAY_ATTRIBUTES_TOPIC:
-                        registerSubQoS(topic, grantedQoSList, reqQoS);
-                        break;
-                    case GATEWAY_RPC_TOPIC:
-                        registerSubQoS(topic, grantedQoSList, reqQoS);
-                        break;
                     default:
                         log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS);
                         grantedQoSList.add(FAILURE.value());