diff --git a/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl b/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl
index aa8bc35db..d9b203ffb 100644
--- a/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl
+++ b/compiler/extensions/cpp/freemarker/Bitmask.cpp.ftl
@@ -23,7 +23,7 @@
 <#if underlyingTypeInfo.arrayTraits.isTemplated && underlyingTypeInfo.arrayTraits.requiresElementDynamicBitSize>
 uint8_t ${name}::ZserioElementBitSize::get()
 {
-    return ${bitSize.value};
+    return static_cast<uint8_t>(${bitSize.value});
 }
 
 </#if>
diff --git a/compiler/extensions/cpp/freemarker/Enumeration.cpp.ftl b/compiler/extensions/cpp/freemarker/Enumeration.cpp.ftl
index b8afdfd09..8a2d17f6d 100644
--- a/compiler/extensions/cpp/freemarker/Enumeration.cpp.ftl
+++ b/compiler/extensions/cpp/freemarker/Enumeration.cpp.ftl
@@ -33,7 +33,7 @@ constexpr const char* EnumTraits<${fullName}>::enumName;
 
 uint8_t EnumTraits<${fullName}>::ZserioElementBitSize::get()
 {
-    return ${bitSize.value};
+    return static_cast<uint8_t>(${bitSize.value});
 }
 </#if>
 <#if withTypeInfoCode>