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 e2109a5535..71b58d759a 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
@@ -349,6 +349,9 @@ public class RepositoryUtils {
     }
 
     public static DataPoint getSortValue(EntityData entity, DataKey sortKey, QueryContext queryContext) {
+        if (sortKey == null) {
+            return null;
+        }
        return entity.getDataPoint(sortKey, queryContext);
     }