diff --git a/changelog/unreleased/oidc-fix.md b/changelog/unreleased/oidc-fix.md
new file mode 100644
index 0000000000..9cb8c8b937
--- /dev/null
+++ b/changelog/unreleased/oidc-fix.md
@@ -0,0 +1,4 @@
+Bugfix: Fix oidc provider crash when custom claims are provided
+
+https://github.com/cs3org/reva/pull/3319
+
diff --git a/pkg/auth/manager/oidc/oidc.go b/pkg/auth/manager/oidc/oidc.go
index 2b36d633d1..d43e0fdfdc 100644
--- a/pkg/auth/manager/oidc/oidc.go
+++ b/pkg/auth/manager/oidc/oidc.go
@@ -310,6 +310,10 @@ func (am *mgr) resolveUser(ctx context.Context, claims map[string]interface{}) e
 	)
 
 	uid, gid := am.getUserID(claims)
+	if uid != 0 && gid != 0 {
+		claims[am.c.UIDClaim] = uid
+		claims[am.c.GIDClaim] = gid
+	}
 
 	if len(am.oidcUsersMapping) > 0 {
 		claim = "username"