diff --git a/multi_user/bl_types/bl_curve.py b/multi_user/bl_types/bl_curve.py
index ec7954e..4c03849 100644
--- a/multi_user/bl_types/bl_curve.py
+++ b/multi_user/bl_types/bl_curve.py
@@ -239,3 +239,10 @@ class BlCurve(BlDatablock):
                 deps.append(material)
 
         return deps
+
+    def diff(self):
+        if 'EDIT' in bpy.context.mode \
+                and not self.preferences.sync_flags.sync_during_editmode:
+            return False
+        else:
+            return super().diff()
\ No newline at end of file
diff --git a/multi_user/bl_types/bl_mesh.py b/multi_user/bl_types/bl_mesh.py
index a67ba55..8297737 100644
--- a/multi_user/bl_types/bl_mesh.py
+++ b/multi_user/bl_types/bl_mesh.py
@@ -174,3 +174,10 @@ class BlMesh(BlDatablock):
                 deps.append(material)
 
         return deps
+
+    def diff(self):
+        if 'EDIT' in bpy.context.mode \
+                and not self.preferences.sync_flags.sync_during_editmode:
+            return False
+        else:
+            return super().diff()
diff --git a/multi_user/operators.py b/multi_user/operators.py
index 1a7292e..a71d666 100644
--- a/multi_user/operators.py
+++ b/multi_user/operators.py
@@ -997,11 +997,6 @@ def depsgraph_evaluation(scene):
                 #   - if its to someone else, ignore the update
                 if node and node.owner in [session.id, RP_COMMON]:
                     if node.state == UP:
-                        # Avoid slow geometry update
-                        if 'EDIT' in context.mode and \
-                                not settings.sync_flags.sync_during_editmode:
-                            break
-
                         try:
                             if node.has_changed():
                                 session.commit(node.uuid)