diff --git a/pkg/oidc/token.go b/pkg/oidc/token.go
index 5b18dac9..a829df4f 100644
--- a/pkg/oidc/token.go
+++ b/pkg/oidc/token.go
@@ -117,6 +117,7 @@ func NewAccessTokenClaims(issuer, subject string, audience []string, expiration
 			Expiration: FromTime(expiration),
 			IssuedAt:   FromTime(now),
 			NotBefore:  FromTime(now),
+			ClientID:   clientID,
 			JWTID:      jwtid,
 		},
 	}
diff --git a/pkg/oidc/token_test.go b/pkg/oidc/token_test.go
index ccc34671..7847cb5d 100644
--- a/pkg/oidc/token_test.go
+++ b/pkg/oidc/token_test.go
@@ -145,6 +145,7 @@ func TestNewAccessTokenClaims(t *testing.T) {
 			Subject:    "hello@me.com",
 			Audience:   Audience{"foo"},
 			Expiration: 12345,
+			ClientID:   "foo",
 			JWTID:      "900",
 		},
 	}