diff --git a/pkg/evaluators/identity.go b/pkg/evaluators/identity.go
index 0bce9cbf..01608d47 100644
--- a/pkg/evaluators/identity.go
+++ b/pkg/evaluators/identity.go
@@ -199,11 +199,13 @@ func (config *IdentityConfig) ResolveExtendedProperties(pipeline auth.AuthPipeli
 	authJSON := pipeline.GetAuthorizationJSON()
 
 	for _, extendedProperty := range config.ExtendedProperties {
-		resolved, err := extendedProperty.ResolveFor(extendedIdentityObject, authJSON)
-		if err != nil {
-			return nil, err
+		if extendedProperty.Value != nil {
+			resolved, err := extendedProperty.ResolveFor(extendedIdentityObject, authJSON)
+			if err != nil {
+				return nil, err
+			}
+			extendedIdentityObject[extendedProperty.Name] = resolved
 		}
-		extendedIdentityObject[extendedProperty.Name] = resolved
 	}
 
 	return extendedIdentityObject, nil