diff --git a/src/app/clusters/scenes/ExtensionFieldSetsImpl.cpp b/src/app/clusters/scenes/ExtensionFieldSetsImpl.cpp
index 60cdad7cd96989..48f2d939f07675 100644
--- a/src/app/clusters/scenes/ExtensionFieldSetsImpl.cpp
+++ b/src/app/clusters/scenes/ExtensionFieldSetsImpl.cpp
@@ -93,7 +93,7 @@ CHIP_ERROR ExtensionFieldSetsImpl::InsertFieldSet(ExtensionFieldsSet & fieldSet)
             break;
         }
 
-        if (this->mEFS[i].IsEmpty() && firstEmptyPosition == 0xFF)
+        if (this->mEFS[i].IsEmpty() && firstEmptyPosition == kInvalidPosition)
         {
             firstEmptyPosition = i;
         }