diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
index 93875007df..fccdae02ba 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.TsValue;
 
+import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -86,8 +87,8 @@ public class EntityDataAdapter {
                     return strVal;
                 }
                 try {
-                    long longVal = Long.parseLong(strVal);
-                    return Long.toString(longVal);
+                    BigInteger longVal = new BigInteger(strVal);
+                    return longVal.toString();
                 } catch (NumberFormatException ignored) {
                 }
                 try {
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java
index 89f1dad5ba..42b1e2c2f6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityDataAdapterTest.java
@@ -27,5 +27,8 @@ public class EntityDataAdapterTest {
         assertThat(EntityDataAdapter.convertValue("500D")).isEqualTo("500D"); //do not convert to Double !!!
         assertThat(EntityDataAdapter.convertValue("0101010521130565")).isEqualTo("0101010521130565"); //do not convert to Double !!!
         assertThat(EntityDataAdapter.convertValue("89010303310033979663")).isEqualTo("89010303310033979663"); //do not convert to Double !!!
+        assertThat(EntityDataAdapter.convertValue("89914009129080723322")).isEqualTo("89914009129080723322");
+        assertThat(EntityDataAdapter.convertValue("899140091AAAA29080723322")).isEqualTo("899140091AAAA29080723322");
+        assertThat(EntityDataAdapter.convertValue("899140091.29080723322")).isEqualTo("899140091.29080723322");
     }
 }