diff --git a/packages/core/src/api/sync/index.ts b/packages/core/src/api/sync/index.ts
index 02686af67..4c40389b5 100644
--- a/packages/core/src/api/sync/index.ts
+++ b/packages/core/src/api/sync/index.ts
@@ -251,6 +251,7 @@ class Sync {
           .selectFrom("content")
           .select("noteId as id")
           .where("conflicted", "is not", null)
+          .where("conflicted", "is not", false)
           .$castTo<string | null>()
       )
       .set({ conflicted: true })