diff --git a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
index 035395746..5885efae3 100644
--- a/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
+++ b/packages/twenty-server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
@@ -364,6 +364,10 @@ export class WorkspaceQueryRunnerService {
     const result = graphqlResult?.[0]?.resolve?.data?.[entityKey];
     const errors = graphqlResult?.[0]?.resolve?.errors;
 
+    if (['update', 'deleteFrom'].includes(command) && !result.affectedCount) {
+      throw new BadRequestException('No rows were affected.');
+    }
+
     if (errors && errors.length > 0) {
       const error = computePgGraphQLError(
         command,