diff --git a/src/data-model-providers/codegen/CodegenDataModelProvider.cpp b/src/data-model-providers/codegen/CodegenDataModelProvider.cpp
index 95f5934465c583..9d6a1f94f85cba 100644
--- a/src/data-model-providers/codegen/CodegenDataModelProvider.cpp
+++ b/src/data-model-providers/codegen/CodegenDataModelProvider.cpp
@@ -392,7 +392,7 @@ class EndpointIterator : public DataModel::MetaDataIterator<EndpointId, DataMode
         if ((hint < lastEndpointIndex) && (emberAfEndpointFromIndex(hint) == id))
         {
             mMetadataIndex = hint;
-            mIndex         = hint + 1;
+            mIndex         = static_cast<uint16_t>(hint + 1);
             return true;
         }
         // not found. Just seek until found