diff --git a/common/data/pom.xml b/common/data/pom.xml
index 5a5838d7da..2cdb30457f 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -65,8 +65,8 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
index acf0d2f71e..2dac4f0a7c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
@@ -20,7 +20,6 @@ import lombok.Data;
 
 import org.springframework.data.domain.Sort;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/pom.xml b/pom.xml
index b7c873898f..4f2713e190 100755
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
         <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
         <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+        <spring-data.version>2.3.9.RELEASE</spring-data.version>
         <spring.version>5.2.16.RELEASE</spring.version>
         <spring-redis.version>5.2.11.RELEASE</spring-redis.version>
         <spring-security.version>5.4.7</spring-security.version>
@@ -1130,6 +1131,11 @@
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
                 <version>${spring-boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.data</groupId>
+                <artifactId>spring-data-commons</artifactId>
+                <version>${spring-data.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>