diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts
index 4b73cc30b3..cbf0d44fef 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts
+++ b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DatabaseDataEditor.ts
@@ -200,7 +200,11 @@ export class DatabaseDataEditor<TResult extends IDatabaseDataResult> implements
     }
 
     if (!this.isRowEdited(result, row)) {
-      this.editedResults.delete(result.id);
+      update?.diff.delete(row);
+
+      if (update?.diff.size === 0) {
+        this.editedResults.delete(result.id);
+      }
     }
   }