diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
index 6dc7fa3f79..0c83ae4e61 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
@@ -31,6 +31,7 @@ import java.util.UUID;
 import java.util.function.Consumer;
 
 import static org.thingsboard.server.edqs.util.RepositoryUtils.checkFilters;
+import static org.thingsboard.server.edqs.util.RepositoryUtils.getSortValue;
 
 public abstract class AbstractQueryProcessor<T extends EntityFilter> implements EntityQueryProcessor {
 
@@ -50,8 +51,7 @@ public abstract class AbstractQueryProcessor<T extends EntityFilter> implements
 
     protected SortableEntityData toSortData(EntityData<?> ed) {
         SortableEntityData sortData = new SortableEntityData(ed);
-        DataPoint sortValue = ed.getDataPoint(sortKey, ctx);
-        sortData.setSortValue(sortValue);
+        sortData.setSortValue(getSortValue(ed, sortKey, ctx));
         return sortData;
     }
 
diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/util/RepositoryUtils.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/util/RepositoryUtils.java
index 203505aea8..e2109a5535 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/util/RepositoryUtils.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/util/RepositoryUtils.java
@@ -348,6 +348,10 @@ public class RepositoryUtils {
         }
     }
 
+    public static DataPoint getSortValue(EntityData entity, DataKey sortKey, QueryContext queryContext) {
+       return entity.getDataPoint(sortKey, queryContext);
+    }
+
     public static boolean checkFilters(EdqsQuery query, EntityData entity) {
         if (entity == null || entity.getFields() == null) {
             return false; // Entity was already removed or not arrived yet;