diff --git a/src/app/clusters/fixed-label-server/fixed-label-server.cpp b/src/app/clusters/fixed-label-server/fixed-label-server.cpp index 7379e845f4323e..a2dc23c791ffa1 100644 --- a/src/app/clusters/fixed-label-server/fixed-label-server.cpp +++ b/src/app/clusters/fixed-label-server/fixed-label-server.cpp @@ -59,23 +59,16 @@ CHIP_ERROR FixedLabelAttrAccess::ReadLabelList(EndpointId endpoint, AttributeVal if (it) { - if (it->Count() > 0) - { - err = aEncoder.EncodeList([&it](const auto & encoder) -> CHIP_ERROR { - FixedLabel::Structs::LabelStruct::Type fixedlabel; - - while (it->Next(fixedlabel)) - { - ReturnErrorOnFailure(encoder.Encode(fixedlabel)); - } - - return CHIP_NO_ERROR; - }); - } - else - { - err = aEncoder.EncodeEmptyList(); - } + err = aEncoder.EncodeList([&it](const auto & encoder) -> CHIP_ERROR { + FixedLabel::Structs::LabelStruct::Type fixedlabel; + + while (it->Next(fixedlabel)) + { + ReturnErrorOnFailure(encoder.Encode(fixedlabel)); + } + + return CHIP_NO_ERROR; + }); it->Release(); }