diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java
index a804c64e..a737ae82 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java
@@ -72,13 +72,19 @@ class JdbcAggregateChangeExecutionContext {
 		RelationalPersistentEntity<T> persistentEntity = getRequiredPersistentEntity(insert.getEntityType());
 
 		Object id;
-		RelationalPersistentProperty versionProperty = persistentEntity.getVersionProperty();
-		if (versionProperty != null) {
+		if (persistentEntity.hasVersionProperty()) {
+
+			RelationalPersistentProperty versionProperty = persistentEntity.getVersionProperty();
+
+			Assert.state(versionProperty != null, "Version property must not be null at this stage.");
+
 			long initialVersion = versionProperty.getActualType().isPrimitive() ? 1L : 0;
 
-			T rootEntity = RelationalEntityVersionUtils
-					.setVersionNumberOnEntity(insert.getEntity(), initialVersion, persistentEntity, converter);
+			T rootEntity = RelationalEntityVersionUtils.setVersionNumberOnEntity( //
+					insert.getEntity(), initialVersion, persistentEntity, converter);
+
 			id = accessStrategy.insert(rootEntity, insert.getEntityType(), Identifier.empty());
+
 			setNewVersion(initialVersion);
 		} else {
 			id = accessStrategy.insert(insert.getEntity(), insert.getEntityType(), Identifier.empty());
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java
index e050ed33..15acc6c8 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java
@@ -84,19 +84,11 @@ public class JdbcAggregateChangeExecutorContextUnitTests {
 	}
 
 	@Test // DATAJDBC-507
-	public void afterInsertPrimitiveVersionShouldBe1() {
+	public void afterInsertNotPrimitiveVersionShouldBeZero() {
+
 		DummyEntityNonPrimitiveVersion dummyEntityNonPrimitiveVersion = new DummyEntityNonPrimitiveVersion();
-		when(
-				accessStrategy.insert(dummyEntityNonPrimitiveVersion, DummyEntityNonPrimitiveVersion.class, Identifier.empty()))
-				.thenReturn(23L);
 
 		executionContext.executeInsertRoot(new DbAction.InsertRoot<>(dummyEntityNonPrimitiveVersion));
-
-		DummyEntity newRoot = executionContext.populateIdsIfNecessary();
-
-		assertThat(newRoot).isNull();
-		assertThat(dummyEntityNonPrimitiveVersion.id).isEqualTo(23L);
-
 		executionContext.populateRootVersionIfNecessary(dummyEntityNonPrimitiveVersion);
 
 		assertThat(dummyEntityNonPrimitiveVersion.version).isEqualTo(0);
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java
index f8cb157c..c406fc9e 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java
@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.Wither;
+import lombok.With;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -847,53 +847,40 @@ public class JdbcAggregateTemplateIntegrationTests {
 	}
 
 	private <T extends Number> void saveAndUpdateAggregateWithVersion(VersionedAggregate aggregate,
-																	  Function<Number, T> toConcreteNumber) {
-
-		template.save(aggregate);
-
-		VersionedAggregate reloadedAggregate = template.findById(aggregate.getId(), aggregate.getClass());
-		assertThat(reloadedAggregate.getVersion()).isEqualTo(toConcreteNumber.apply(0))
-				.withFailMessage("version field should initially have the value 0");
-		template.save(reloadedAggregate);
-
-		VersionedAggregate updatedAggregate = template.findById(aggregate.getId(), aggregate.getClass());
-		assertThat(updatedAggregate.getVersion()).isEqualTo(toConcreteNumber.apply(1))
-				.withFailMessage("version field should increment by one with each save");
-
-		reloadedAggregate.setVersion(toConcreteNumber.apply(0));
-		assertThatThrownBy(() -> template.save(reloadedAggregate))
-				.hasRootCauseInstanceOf(OptimisticLockingFailureException.class)
-				.withFailMessage("saving an aggregate with an outdated version should raise an exception");
-
-		reloadedAggregate.setVersion(toConcreteNumber.apply(2));
-		assertThatThrownBy(() -> template.save(reloadedAggregate))
-				.hasRootCauseInstanceOf(OptimisticLockingFailureException.class)
-				.withFailMessage("saving an aggregate with a future version should raise an exception");
+			Function<Number, T> toConcreteNumber) {
+		saveAndUpdateAggregateWithVersion(aggregate, toConcreteNumber, 0);
 	}
 
 	private <T extends Number> void saveAndUpdateAggregateWithPrimitiveVersion(VersionedAggregate aggregate,
 			Function<Number, T> toConcreteNumber) {
+		saveAndUpdateAggregateWithVersion(aggregate, toConcreteNumber, 1);
+	}
+
+	private <T extends Number> void saveAndUpdateAggregateWithVersion(VersionedAggregate aggregate,
+			Function<Number, T> toConcreteNumber, int initialId) {
 
 		template.save(aggregate);
 
 		VersionedAggregate reloadedAggregate = template.findById(aggregate.getId(), aggregate.getClass());
-		assertThat(reloadedAggregate.getVersion()).isEqualTo(toConcreteNumber.apply(1))
-				.withFailMessage("version field should initially have the value 1");
+		assertThat(reloadedAggregate.getVersion()) //
+				.withFailMessage("version field should initially have the value 0")
+				.isEqualTo(toConcreteNumber.apply(initialId));
 		template.save(reloadedAggregate);
 
 		VersionedAggregate updatedAggregate = template.findById(aggregate.getId(), aggregate.getClass());
-		assertThat(updatedAggregate.getVersion()).isEqualTo(toConcreteNumber.apply(2))
-				.withFailMessage("version field should increment by one with each save");
+		assertThat(updatedAggregate.getVersion()) //
+				.withFailMessage("version field should increment by one with each save")
+				.isEqualTo(toConcreteNumber.apply(initialId + 1));
 
-		reloadedAggregate.setVersion(toConcreteNumber.apply(1));
+		reloadedAggregate.setVersion(toConcreteNumber.apply(initialId));
 		assertThatThrownBy(() -> template.save(reloadedAggregate))
-				.hasRootCauseInstanceOf(OptimisticLockingFailureException.class)
-				.withFailMessage("saving an aggregate with an outdated version should raise an exception");
+				.withFailMessage("saving an aggregate with an outdated version should raise an exception")
+				.hasRootCauseInstanceOf(OptimisticLockingFailureException.class);
 
-		reloadedAggregate.setVersion(toConcreteNumber.apply(3));
+		reloadedAggregate.setVersion(toConcreteNumber.apply(initialId + 2));
 		assertThatThrownBy(() -> template.save(reloadedAggregate))
-				.hasRootCauseInstanceOf(OptimisticLockingFailureException.class)
-				.withFailMessage("saving an aggregate with a future version should raise an exception");
+				.withFailMessage("saving an aggregate with a future version should raise an exception")
+				.hasRootCauseInstanceOf(OptimisticLockingFailureException.class);
 	}
 
 	private Long count(String tableName) {
@@ -1113,12 +1100,12 @@ public class JdbcAggregateTemplateIntegrationTests {
 	}
 
 	@Value
-	@Wither
+	@With
 	@Table("VERSIONED_AGGREGATE")
 	static class AggregateWithImmutableVersion {
 
-		@Id private Long id;
-		@Version private final Long version;
+		@Id Long id;
+		@Version Long version;
 	}
 
 	@Data