diff --git a/pkg/op/token.go b/pkg/op/token.go
index fe6658a..5331d44 100644
--- a/pkg/op/token.go
+++ b/pkg/op/token.go
@@ -69,7 +69,11 @@ func CreateAccessToken(ctx context.Context, tokenRequest TokenRequest, accessTok
 	if err != nil {
 		return "", 0, err
 	}
-	validity = exp.Add(client.ClockSkew()).Sub(time.Now().UTC())
+	var clockSkew time.Duration
+	if client != nil {
+		clockSkew = client.ClockSkew()
+	}
+	validity = exp.Add(clockSkew).Sub(time.Now().UTC())
 	if accessTokenType == AccessTokenTypeJWT {
 		token, err = CreateJWT(ctx, creator.Issuer(), tokenRequest, exp, id, creator.Signer(), client, creator.Storage())
 		return