diff --git a/packages/server/src/db/migrate.ts b/packages/server/src/db/migrate.ts
index a32858b7..d63bb3af 100644
--- a/packages/server/src/db/migrate.ts
+++ b/packages/server/src/db/migrate.ts
@@ -1993,6 +1993,7 @@ function migrateFixOneOnOneOwnerIds(db: Database.Database): void {
         HAVING COUNT(*) = 2
       )
       AND owner_id IS NOT NULL
+      AND (federated_id IS NULL OR length(federated_id) = 32)
     `).run();
 
     if (result.changes > 0) {