diff --git a/webhooks/queue.go b/webhooks/queue.go
index 5cfcc6719028fc2e8c3489a4caa75300670f62f7..8286034d4d2340d8704fb5fd694dcdb977dda652 100644
--- a/webhooks/queue.go
+++ b/webhooks/queue.go
@@ -152,7 +152,7 @@ 				&sub.TokenHash, &sub.Grants, &sub.ClientID, &sub.Expires,
 				&sub.NodeID); err != nil {
 				panic(err)
 			}
-			if sub.Expires.After(time.Now()) {
+			if sub.Expires == nil || sub.Expires.After(time.Now()) {
 				subs = append(subs, &sub)
 			}
 		}