1 files changed, 6 insertions, 3 deletions

diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index 759aa2779..026c30135 100644
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -154,9 +154,12 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
     return OAuthTokenModel.scope(ScopeNames.WITH_ACCOUNT)
       .findOne(query)
       .then(token => {
-        token['user'] = token.User
-
-        return token
+        if (token) {
+          token['user'] = token.User
+          return token
+        } else {
+          return new OAuthTokenModel()
+        }
       })
   }