diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
index 1ee9473b..b8c3b89a 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
@@ -111,7 +111,7 @@ public class SimpleCouchbaseRepository<T, ID> extends CouchbaseRepositoryBase<T,
 	@Override
 	public void delete(T entity) {
 		Assert.notNull(entity, "Entity must not be null!");
-		operations.removeById(getJavaType()).inScope(getScope()).inCollection(getCollection()).one(getId(entity));
+		operations.removeById(getJavaType()).inScope(getScope()).inCollection(getCollection()).oneEntity(entity);
 	}
 
 	@Override
@@ -125,7 +125,7 @@ public class SimpleCouchbaseRepository<T, ID> extends CouchbaseRepositoryBase<T,
 	public void deleteAll(Iterable<? extends T> entities) {
 		Assert.notNull(entities, "The given Iterable of entities must not be null!");
 		operations.removeById(getJavaType()).inScope(getScope()).inCollection(getCollection())
-				.all(Streamable.of(entities).map(this::getId).toList());
+				.allEntities((Collection<Object>)Streamable.of(entities).toList());
 	}
 
 	@Override
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
index 4c31557b..a0a015fd 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
@@ -113,7 +113,7 @@ public class CouchbaseRepositoryKeyValueIntegrationTests extends ClusterAwareInt
 		assertThrows(DuplicateKeyException.class, () -> userRepository.save(user));
 		user.setVersion(saveVersion + 1);
 		assertThrows(OptimisticLockingFailureException.class, () -> userRepository.save(user));
-		userRepository.delete(user);
+		userRepository.deleteById(user.getId());
 
 		// Airline does not have a version
 		Airline airline = new Airline(UUID.randomUUID().toString(), "MyAirline", null);