diff --git a/spring-versions-jpa/src/main/java/org/springframework/versions/impl/LockingAndVersioningRepositoryImpl.java b/spring-versions-jpa/src/main/java/org/springframework/versions/impl/LockingAndVersioningRepositoryImpl.java
index 625eac1cc..c9884b798 100644
--- a/spring-versions-jpa/src/main/java/org/springframework/versions/impl/LockingAndVersioningRepositoryImpl.java
+++ b/spring-versions-jpa/src/main/java/org/springframework/versions/impl/LockingAndVersioningRepositoryImpl.java
@@ -288,7 +288,7 @@ public <S extends T> List<S> findAllVersionsLatest() {
     @Override
     public <S extends T> List<S> findAllVersionsLatest(Class<S> entityClass) {
 
-        String sql = "select t from ${entityClass} t where t.${successorId} = null and t.${id} NOT IN (select f1.${id} FROM ${entityClass} f1 inner join ${entityClass} f2 on f1.${ancestorId} = f2.${id} and f2.${successorId} = null)";
+        String sql = "select t from ${entityClass} t where t.${successorId} IS NULL and t.${id} NOT IN (select f1.${id} FROM ${entityClass} f1 inner join ${entityClass} f2 on f1.${ancestorId} = f2.${id} and f2.${successorId} IS NULL)";
 
         StringSubstitutor sub = new StringSubstitutor(getAttributeMap(entityClass));
         sql = sub.replace(sql);