diff --git a/data/model/appspecifictoken.py b/data/model/appspecifictoken.py
index 282fa458c..6b0921bd0 100644
--- a/data/model/appspecifictoken.py
+++ b/data/model/appspecifictoken.py
@@ -60,7 +60,8 @@ def get_expiring_tokens(user, soon):
   return (AppSpecificAuthToken
           .select()
           .where(AppSpecificAuthToken.user == user,
-                 AppSpecificAuthToken.expiration <= soon_datetime))
+                 AppSpecificAuthToken.expiration <= soon_datetime,
+                 AppSpecificAuthToken.expiration > datetime.now()))
 
 
 def gc_expired_tokens(user):