diff --git a/webhooks/config.go b/webhooks/config.go
index 717dca32f415af6eda47ff7fd43da9cd6624069e..8bf62d3f30b0c11f6f49ab9c2c1d41ecab4ea16b 100644
--- a/webhooks/config.go
+++ b/webhooks/config.go
@@ -76,10 +76,8 @@ 			sq.Expr(`user_id = ?`, user.UserID),
 			sq.Expr(`auth_method = 'INTERNAL'`),
 		}, nil
 	} else if ac.ClientID != nil {
-		// XXX: Should we maybe return all webhooks configured by client ID?
 		return sq.And{
 			sq.Expr(`NOW() at time zone 'utc' < expires`),
-			sq.Expr(`token_hash = ?`, ac.TokenHash),
 			sq.Expr(`client_id = ?`, *ac.ClientID),
 			sq.Expr(`user_id = ?`, user.UserID),
 		}, nil