diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp index 295b5535df2f95..f2cd1fb9ec3d39 100644 --- a/src/app/clusters/access-control-server/access-control-server.cpp +++ b/src/app/clusters/access-control-server/access-control-server.cpp @@ -522,15 +522,8 @@ void AccessControlAttribute::OnFabricRestrictionReviewUpdate(FabricIndex fabricI CHIP_ERROR err; ArlReviewEvent event{ .token = token, .fabricIndex = fabricIndex }; - if (instruction.HasValue()) - { - event.instruction.SetNonNull(instruction.Value()); - } - - if (redirectUrl.HasValue()) - { - event.redirectURL.SetNonNull(redirectUrl.Value()); - } + event.instruction = instruction; + event.redirectURL = redirectUrl; EventNumber eventNumber; SuccessOrExit(err = LogEvent(event, kRootEndpointId, eventNumber));