diff --git a/packages/core/models/user.js b/packages/core/models/user.js
index 7cbe69a53..84e97eeb6 100644
--- a/packages/core/models/user.js
+++ b/packages/core/models/user.js
@@ -16,6 +16,7 @@ export default class User {
 
   async key() {
     const user = await this.get();
+    if (!user) return;
     return { key: user.key, salt: user.salt };
   }