diff --git a/src/lib/Diff.ts b/src/lib/Diff.ts
index a39dac4199..adf0d33bb7 100644
--- a/src/lib/Diff.ts
+++ b/src/lib/Diff.ts
@@ -214,7 +214,7 @@ export default class Diff<L1 extends TItemLocation, L2 extends TItemLocation, A
           newAction.payload.id = Mappings.mapId(mappingsSnapshot, action.payload, targetLocation)
         }
 
-        if (oldItem && targetLocation !== ItemLocation.SERVER && action.type !== ActionType.MOVE && action.type !== ActionType.UPDATE) {
+        if (oldItem && targetLocation !== ItemLocation.SERVER && action.type !== ActionType.MOVE) {
           newAction.payload.parentId = action.oldItem.parentId
           newAction.oldItem.parentId = action.payload.parentId
         } else {
diff --git a/src/lib/strategies/Default.ts b/src/lib/strategies/Default.ts
index b87d9237b2..1bdc0ee704 100644
--- a/src/lib/strategies/Default.ts
+++ b/src/lib/strategies/Default.ts
@@ -331,7 +331,7 @@ export default class SyncProcess {
       Logger.log('Retrieving server tree')
       const serverTreeRoot = await this.server.getBookmarksTree()
       Logger.log('Filtering out invalid server bookmarks')
-      this.filterOutInvalidBookmarks(this.serverTreeRoot)
+      this.filterOutInvalidBookmarks(serverTreeRoot)
 
       if (this.canceled) {
         throw new CancelledSyncError()
diff --git a/src/test/test.js b/src/test/test.js
index 859be33edf..eef4f8ba89 100644
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -3725,18 +3725,21 @@ describe('Floccus', function() {
             expectTreeEqual(
               tree1AfterFirstSync,
               tree1,
+              false,
               false
             )
             serverTreeAfterFirstSync.title = tree1.title
             expectTreeEqual(
               serverTreeAfterFirstSync,
               tree1,
+              false,
               false
             )
             tree2AfterFirstSync.title = tree1.title
             expectTreeEqual(
               tree2AfterFirstSync,
               tree1,
+              false,
               false
             )
             console.log('First round ok')
@@ -3771,6 +3774,7 @@ describe('Floccus', function() {
             expectTreeEqual(
               serverTreeAfterThirdSync,
               tree1AfterThirdSync,
+              false,
               false
             )
 
@@ -3789,12 +3793,14 @@ describe('Floccus', function() {
             expectTreeEqual(
               serverTreeAfterFinalSync,
               tree2AfterFinalSync,
+              false,
               false
             )
             tree1AfterThirdSync.title = tree2AfterFinalSync.title
             expectTreeEqual(
               tree2AfterFinalSync,
               tree1AfterThirdSync,
+              false,
               false
             )
           })
@@ -6095,7 +6101,7 @@ describe('Floccus', function() {
             delete account2.server.onSyncStart
             delete account2.server.onSyncComplete
             await interruptBenchmark()
-          })
+          }).retries(3)
         }
 
         it('unidirectional should handle fuzzed changes from two clients', async function() {