diff --git a/pom.xml b/pom.xml
index 16eaf699f7..0e0a2bc029 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.0-GH-3999-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>
diff --git a/spring-data-envers/pom.xml b/spring-data-envers/pom.xml
index 0bdf2c8e7e..cd7500b0cb 100755
--- a/spring-data-envers/pom.xml
+++ b/spring-data-envers/pom.xml
@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.0-GH-3999-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-GH-3999-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
index 4515a74ed9..aeb84f6455 100755
--- a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
+++ b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
@@ -93,6 +93,7 @@ public EnversRevisionRepositoryImpl(JpaEntityInformation<T, ?> entityInformation
 		this.entityManager = entityManager;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Optional<Revision<N, T>> findLastChangeRevision(ID id) {
 
@@ -131,6 +132,7 @@ public Optional<Revision<N, T>> findRevision(ID id, N revisionNumber) {
 		return Optional.of(createRevision(new QueryResult<>(singleResult.get(0))));
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Revisions<N, T> findRevisions(ID id) {
 
@@ -171,6 +173,7 @@ private List<AuditOrder> mapPropertySort(Sort sort) {
 		return result;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Page<Revision<N, T>> findRevisions(ID id, Pageable pageable) {
 
@@ -182,9 +185,12 @@ public Page<Revision<N, T>> findRevisions(ID id, Pageable pageable) {
 
 		orderMapped.forEach(baseQuery::addOrder);
 
+		if (pageable.isPaged()) {
+			baseQuery.setFirstResult((int) pageable.getOffset()) //
+					.setMaxResults(pageable.getPageSize());
+		}
+
 		List<Object[]> resultList = baseQuery //
-				.setFirstResult((int) pageable.getOffset()) //
-				.setMaxResults(pageable.getPageSize()) //
 				.getResultList();
 
 		Long count = (Long) createBaseQuery(id) //
diff --git a/spring-data-envers/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java b/spring-data-envers/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java
index 43f159b633..bf04d06e28 100755
--- a/spring-data-envers/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java
+++ b/spring-data-envers/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java
@@ -15,12 +15,23 @@
  */
 package org.springframework.data.envers.repository.support;
 
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.history.RevisionMetadata.RevisionType.*;
+
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Optional;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.envers.Config;
 import org.springframework.data.envers.sample.Country;
@@ -33,21 +44,13 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.springframework.data.history.RevisionMetadata.RevisionType.*;
-
 /**
  * Integration tests for repositories.
  *
  * @author Oliver Gierke
  * @author Jens Schauder
  * @author Niklas Loechte
+ * @author Mark Paluch
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = Config.class)
@@ -107,6 +110,40 @@ void testLifeCycle() {
 		});
 	}
 
+	@Test // GH-3999
+	void shouldReturnUnpagedResults() {
+
+		License license = new License();
+		license.name = "Schnitzel";
+
+		licenseRepository.save(license);
+
+		Country de = new Country();
+		de.code = "de";
+		de.name = "Deutschland";
+
+		countryRepository.save(de);
+
+		Country se = new Country();
+		se.code = "se";
+		se.name = "Schweden";
+
+		countryRepository.save(se);
+
+		license.laender = new HashSet<>();
+		license.laender.addAll(Arrays.asList(de, se));
+
+		licenseRepository.save(license);
+
+		de.name = "Daenemark";
+
+		countryRepository.save(de);
+
+		Page<Revision<Integer, License>> revisions = licenseRepository.findRevisions(license.id, Pageable.unpaged());
+
+		assertThat(revisions).hasSize(2);
+	}
+
 	@Test // #1
 	void returnsEmptyLastRevisionForUnrevisionedEntity() {
 		assertThat(countryRepository.findLastChangeRevision(100L)).isEmpty();
diff --git a/spring-data-jpa-distribution/pom.xml b/spring-data-jpa-distribution/pom.xml
index af5244a230..9c0872c8f9 100644
--- a/spring-data-jpa-distribution/pom.xml
+++ b/spring-data-jpa-distribution/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-GH-3999-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index cbec8a2645..7263fd8477 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -7,7 +7,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.0-GH-3999-SNAPSHOT</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-GH-3999-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>