diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
index ae4bfee10..6c797994e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -750,7 +750,7 @@ public class Query implements ReadConcernAware, ReadPreferenceAware {
 		boolean sortEqual = this.sort.equals(that.sort);
 		boolean hintEqual = nullSafeEquals(this.hint, that.hint);
 		boolean skipEqual = this.skip == that.skip;
-		boolean limitEqual = this.limit == that.limit;
+		boolean limitEqual = nullSafeEquals(this.limit, that.limit);
 		boolean metaEqual = nullSafeEquals(this.meta, that.meta);
 		boolean collationEqual = nullSafeEquals(this.collation.orElse(null), that.collation.orElse(null));
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
index 452fb6178..a84b652bc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
@@ -89,7 +89,7 @@ class QueryTests {
 				.parse("{ \"$nor\" : [ { \"name\" : \"Sven\"} , { \"age\" : { \"$lt\" : 50}} , { \"name\" : \"Thomas\"}]}"));
 	}
 
-	@Test
+	@Test // GH-4584
 	void testQueryWithLimit() {
 
 		Query q = new Query(where("name").gte("M").lte("T").and("age").not().gt(22));
@@ -110,6 +110,9 @@ class QueryTests {
 		q.limit(Limit.of(-1));
 		assertThat(q.getLimit()).isZero();
 		assertThat(q.isLimited()).isFalse();
+
+		Query other = new Query(where("name").gte("M")).limit(Limit.of(10));
+		assertThat(new Query(where("name").gte("M")).limit(10)).isEqualTo(other).hasSameHashCodeAs(other);
 	}
 
 	@Test