diff --git a/templates/jpa-paginated-repository.java.mustache b/templates/jpa-paginated-repository.java.mustache
index 8f7efed..11922c9 100644
--- a/templates/jpa-paginated-repository.java.mustache
+++ b/templates/jpa-paginated-repository.java.mustache
@@ -18,6 +18,7 @@ import java.util.List;
 import {{{.}}};
 {{/imports}}
 
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
@@ -26,7 +27,7 @@ import org.springframework.stereotype.Repository;
 public interface {{record_type}}Repository extends PagingAndSortingRepository<{{record_type}}, {{pkey_type.name}}> {
 
     {{#indexes}}
-    List<{{record_type}}> findAllBy{{namePascalCase}}(@NonNull {{type.name}} {{name}}, Pageable pagination);
+    Page<List<{{record_type}}>> findAllBy{{namePascalCase}}(@NonNull {{type.name}} {{name}}, Pageable pagination);
     {{/indexes}}
 
 }