diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js
index 231c39ebd..ef73e5f3a 100644
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@@ -478,6 +478,7 @@ define([
                 store: store,
             };
             var myData = Messaging.createData(userObject);
+            if (!myData.curvePublic) { return void done(); }
 
             Mailbox.sendTo(ctx, 'SAFE_LINKS_DEFAULT', {
                 user: myData,