diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index bfcb95a71c..baf2e9b03e 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -473,7 +473,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
                             .addAllClientAttributeList(toTsKvProtos(result.get(0)))
                             .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
                             .setIsMultipleAttributesRequest(
-                                    request.getSharedAttributeNamesCount() > 1 || request.getClientAttributeNamesCount() > 1)
+                                    request.getSharedAttributeNamesCount() + request.getClientAttributeNamesCount() > 1)
                             .build();
                     sendToTransport(responseMsg, sessionInfo);
                 }