diff --git a/common/models/access-token.js b/common/models/access-token.js
index 27cf5206d..389442dfe 100644
--- a/common/models/access-token.js
+++ b/common/models/access-token.js
@@ -146,7 +146,7 @@ module.exports = function(AccessToken) {
       var created = this.created.getTime();
       var elapsedSeconds = (now - created) / 1000;
       var secondsToLive = this.ttl;
-      var isValid = elapsedSeconds < secondsToLive;
+      var isValid = (secondsToLive === -1 && this.constructor.settings.allowEternalTTL) || elapsedSeconds < secondsToLive;
 
       if (isValid) {
         cb(null, isValid);