diff --git a/lib/yoga/src/main/cpp/yoga/BitUtils.h b/lib/yoga/src/main/cpp/yoga/BitUtils.h
index 1c32e9ecc35..2161effc7bb 100644
--- a/lib/yoga/src/main/cpp/yoga/BitUtils.h
+++ b/lib/yoga/src/main/cpp/yoga/BitUtils.h
@@ -45,8 +45,9 @@ void setEnumData(uint32_t& flags, size_t index, int newValue) {
 
 template <typename Enum>
 void setEnumData(uint8_t& flags, size_t index, int newValue) {
-  flags = (flags & ~mask(bitWidthFn<Enum>(), index)) |
-      ((newValue << index) & (mask(bitWidthFn<Enum>(), index)));
+  flags = (flags & ~static_cast<uint8_t>(mask(bitWidthFn<Enum>(), index))) |
+      ((newValue << index) &
+       (static_cast<uint8_t>(mask(bitWidthFn<Enum>(), index))));
 }
 
 constexpr bool getBooleanData(int flags, size_t index) {