diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
index 0e4ba49f68..43ebb9e0a4 100644
--- a/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
+++ b/apps/opik-backend/src/main/java/com/comet/opik/domain/CommentService.java
@@ -24,7 +24,7 @@ public interface CommentService {
 
     Mono<Void> update(UUID commentId, Comment comment);
 
-    Mono<Long> delete(BatchDelete batchDelete);
+    Mono<Void> delete(BatchDelete batchDelete);
 
     Mono<Long> deleteByEntityIds(CommentDAO.EntityType entityType, Set<UUID> entityIds);
 }
@@ -68,8 +68,8 @@ public Mono<Void> update(@NonNull UUID commentId, @NonNull Comment comment) {
     }
 
     @Override
-    public Mono<Long> delete(@NonNull BatchDelete batchDelete) {
-        return commentDAO.deleteByIds(batchDelete.ids());
+    public Mono<Void> delete(@NonNull BatchDelete batchDelete) {
+        return commentDAO.deleteByIds(batchDelete.ids()).then();
     }
 
     @Override
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/BaseTestClient.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/BaseCommentResourceClient.java
similarity index 98%
rename from apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/BaseTestClient.java
rename to apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/BaseCommentResourceClient.java
index 2f45a7ffa1..fc1031e2f4 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/BaseTestClient.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/BaseCommentResourceClient.java
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RequiredArgsConstructor
-public abstract class BaseTestClient {
+public abstract class BaseCommentResourceClient {
     protected final String RESOURCE_PATH;
     protected final ClientSupport client;
     protected final String baseURI;
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java
index 243d23f967..b89af169a9 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/SpanResourceClient.java
@@ -22,7 +22,7 @@
 import static com.comet.opik.infrastructure.auth.RequestContext.WORKSPACE_HEADER;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SpanResourceClient extends BaseTestClient {
+public class SpanResourceClient extends BaseCommentResourceClient {
 
     public SpanResourceClient(ClientSupport client, String baseURI) {
         super("%s/v1/private/spans", client, baseURI);
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
index 4668690f5d..218acb81b0 100644
--- a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
+++ b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/utils/resources/TraceResourceClient.java
@@ -24,7 +24,7 @@
 import static com.comet.opik.infrastructure.auth.RequestContext.WORKSPACE_HEADER;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TraceResourceClient extends BaseTestClient {
+public class TraceResourceClient extends BaseCommentResourceClient {
 
     public TraceResourceClient(ClientSupport client, String baseURI) {
         super("%s/v1/private/traces", client, baseURI);