diff --git a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
index 54bf9a3582..0609dad691 100644
--- a/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
+++ b/integration/spring-data/base-3.1/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
@@ -10,10 +10,12 @@
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
 import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
 import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * @author Christian Beikov
@@ -44,6 +46,11 @@ public KeysetPage getKeysetPage() {
         return keysetPage;
     }
 
+    @Override
+    public <U> Page<U> map(Function<? super T, ? extends U> converter) {
+        return new KeysetAwarePageImpl<U>(this.getConvertedContent(converter), this.getTotalElements(), this.keysetPage, this.getPageable());
+    }
+
     @Override
     public KeysetPageable nextPageable() {
         return (KeysetPageable) super.nextPageable();
diff --git a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
index 54bf9a3582..0609dad691 100644
--- a/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
+++ b/integration/spring-data/base-3.3/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
@@ -10,10 +10,12 @@
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
 import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
 import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * @author Christian Beikov
@@ -44,6 +46,11 @@ public KeysetPage getKeysetPage() {
         return keysetPage;
     }
 
+    @Override
+    public <U> Page<U> map(Function<? super T, ? extends U> converter) {
+        return new KeysetAwarePageImpl<U>(this.getConvertedContent(converter), this.getTotalElements(), this.keysetPage, this.getPageable());
+    }
+
     @Override
     public KeysetPageable nextPageable() {
         return (KeysetPageable) super.nextPageable();
diff --git a/integration/spring-data/base-4.0/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java b/integration/spring-data/base-4.0/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
index 54bf9a3582..0609dad691 100644
--- a/integration/spring-data/base-4.0/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
+++ b/integration/spring-data/base-4.0/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
@@ -10,10 +10,12 @@
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
 import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
 import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * @author Christian Beikov
@@ -44,6 +46,11 @@ public KeysetPage getKeysetPage() {
         return keysetPage;
     }
 
+    @Override
+    public <U> Page<U> map(Function<? super T, ? extends U> converter) {
+        return new KeysetAwarePageImpl<U>(this.getConvertedContent(converter), this.getTotalElements(), this.keysetPage, this.getPageable());
+    }
+
     @Override
     public KeysetPageable nextPageable() {
         return (KeysetPageable) super.nextPageable();
diff --git a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
index 90b16fa43c..fe758b1bda 100644
--- a/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
+++ b/integration/spring-data/base/src/main/java/com/blazebit/persistence/spring/data/base/query/KeysetAwarePageImpl.java
@@ -10,10 +10,12 @@
 import com.blazebit.persistence.spring.data.repository.KeysetAwarePage;
 import com.blazebit.persistence.spring.data.repository.KeysetPageRequest;
 import com.blazebit.persistence.spring.data.repository.KeysetPageable;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * @author Christian Beikov
@@ -43,6 +45,11 @@ public KeysetPage getKeysetPage() {
         return keysetPage;
     }
 
+    @Override
+    public <U> Page<U> map(Function<? super T, ? extends U> converter) {
+        return new KeysetAwarePageImpl<U>(this.getConvertedContent(converter), this.getTotalElements(), this.keysetPage, this.getPageable());
+    }
+
     @Override
     public KeysetPageable nextPageable() {
         return (KeysetPageable) super.nextPageable();