diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
index 48d79022e2..e4898950b2 100644
--- a/src/google/protobuf/descriptor.h
+++ b/src/google/protobuf/descriptor.h
@@ -2893,7 +2893,7 @@ typename FieldOpts::CType EffectiveStringCType(const FieldDesc* field) {
 }
 
 #ifndef SWIG
-enum class Utf8CheckMode {
+enum class Utf8CheckMode : uint8_t {
   kStrict = 0,  // Parsing will fail if non UTF-8 data is in string fields.
   kVerify = 1,  // Only log an error but parsing will succeed.
   kNone = 2,    // No UTF-8 check.
diff --git a/src/google/protobuf/generated_message_tctable_gen.h b/src/google/protobuf/generated_message_tctable_gen.h
index 7dbcd8e1b3..a42de2b479 100644
--- a/src/google/protobuf/generated_message_tctable_gen.h
+++ b/src/google/protobuf/generated_message_tctable_gen.h
@@ -96,7 +96,7 @@ struct PROTOBUF_EXPORT TailCallTableInfo {
     uint16_t type_card;
 
     // For internal caching.
-    cpp::Utf8CheckMode utf8_check_mode : 8;
+    cpp::Utf8CheckMode utf8_check_mode;
   };
   std::vector<FieldEntryInfo> field_entries;