diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp
index 9084e8020eae35..1d93ae5bb1d75e 100644
--- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp
+++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningClient.cpp
@@ -196,7 +196,7 @@ CHIP_ERROR CommissionerDeclaration::ReadPayload(uint8_t * udcPayload, size_t pay
             ChipLogError(AppServer, "Unexpected non-context TLV tag.");
             return CHIP_ERROR_INVALID_TLV_TAG;
         }
-        uint8_t tagNum              = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
+        uint8_t tagNum = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
 
         switch (tagNum)
         {
diff --git a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
index aaed06e399aaef..1a2f125ae5d282 100644
--- a/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
+++ b/src/protocols/user_directed_commissioning/UserDirectedCommissioningServer.cpp
@@ -214,7 +214,7 @@ CHIP_ERROR IdentificationDeclaration::ReadPayload(uint8_t * udcPayload, size_t p
             ChipLogError(AppServer, "Unexpected non-context TLV tag.");
             return CHIP_ERROR_INVALID_TLV_TAG;
         }
-        uint8_t tagNum              = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
+        uint8_t tagNum = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
 
         switch (tagNum)
         {
@@ -262,7 +262,7 @@ CHIP_ERROR IdentificationDeclaration::ReadPayload(uint8_t * udcPayload, size_t p
                         ChipLogError(AppServer, "Unexpected non-context TLV tag.");
                         return CHIP_ERROR_INVALID_TLV_TAG;
                     }
-                    tagNum       = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
+                    tagNum = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
                     if (tagNum == kTargetAppTag)
                     {
                         ReturnErrorOnFailure(reader.EnterContainer(outerContainerType));
@@ -277,7 +277,7 @@ CHIP_ERROR IdentificationDeclaration::ReadPayload(uint8_t * udcPayload, size_t p
                                 ChipLogError(AppServer, "Unexpected non-context TLV tag.");
                                 return CHIP_ERROR_INVALID_TLV_TAG;
                             }
-                            tagNum       = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
+                            tagNum = static_cast<uint8_t>(chip::TLV::TagNumFromTag(containerTag));
                             if (tagNum == kAppVendorIdTag)
                             {
                                 err = reader.Get(appVendorId);