diff --git a/server/middlewares/migrate-completed-challenges.js b/server/middlewares/migrate-completed-challenges.js
index a5f7110f86..9085b98f23 100644
--- a/server/middlewares/migrate-completed-challenges.js
+++ b/server/middlewares/migrate-completed-challenges.js
@@ -104,11 +104,19 @@ export default function migrateCompletedChallenges() {
     if (!user || user.isChallengeMapMigrated) {
       return next();
     }
-    return buildChallengeMap(
-      user.id.toString(),
-      user.completedChallenges,
-      User
-    )
+    const id = user.id.toString();
+    return User.findOne$({
+      where: { id },
+      fields: { completedChallenges: true }
+    })
+      .map(({ completedChallenges = [] } = {}) => completedChallenges)
+      .flatMap(completedChallenges => {
+        return buildChallengeMap(
+          id,
+          completedChallenges,
+          User
+        );
+      })
       .subscribe(
         count => log('documents update', count),
         // errors go here