diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
index fef67ccc72..f55ac89ab5 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
@@ -101,8 +101,7 @@ public class DeviceProfileController extends BaseController {
 
             if (transportConfiguration instanceof MqttProtoDeviceProfileTransportConfiguration) {
                 MqttProtoDeviceProfileTransportConfiguration protoTransportConfiguration = (MqttProtoDeviceProfileTransportConfiguration) transportConfiguration;
-                if (protoTransportConfiguration.getTransportPayloadType().equals(TransportPayloadType.PROTOBUF))
-                    checkProtoSchemas(protoTransportConfiguration);
+                checkProtoSchemas(protoTransportConfiguration);
             }
 
             DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
index aaa8983a0c..e4a35a435f 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
@@ -67,7 +67,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
         Descriptors.Descriptor attributesDynamicMessage = getDescriptor(deviceSessionCtx.getAttributesDynamicMessageDescriptor());
         try {
             return JsonConverter.convertToAttributesProto(new JsonParser().parse(dynamicMsgToJson(bytes, attributesDynamicMessage)));
-        } catch (InvalidProtocolBufferException | IllegalArgumentException e) {
+        } catch (Exception e) {
             throw new AdaptorException(e);
         }
     }
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
index 6ecea5a77c..79147c0935 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java
@@ -80,9 +80,7 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
         return telemetryTopicFilter.filter(topicName);
     }
 
-    public boolean isDeviceAttributesTopic(String topicName) {
-        return attributesTopicFilter.filter(topicName);
-    }
+    public boolean isDeviceAttributesTopic(String topicName) { return attributesTopicFilter.filter(topicName); }
 
     public MqttTransportAdaptor getPayloadAdaptor() {
         return payloadType.equals(TransportPayloadType.JSON) ? context.getJsonMqttAdaptor() : context.getProtoMqttAdaptor();