diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index d452684e40..3aaaa87771 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -76,7 +76,7 @@ void SerialProxyInfo::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_string(1, this->name);
   if (this->port_type) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->port_type)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->port_type));
   }
 }
 uint32_t SerialProxyInfo::calculate_size() const {
@@ -221,7 +221,7 @@ void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer &buffer) const {
 #endif
   if (this->entity_category) {
     buffer.write_raw_byte(72);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(10, this->device_id);
@@ -278,7 +278,7 @@ void ListEntitiesCoverResponse::encode(ProtoWriteBuffer &buffer) const {
 #endif
   if (this->entity_category) {
     buffer.write_raw_byte(88);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_bool(12, this->supports_stop);
 #ifdef USE_DEVICES
@@ -311,7 +311,7 @@ void CoverStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_float(4, this->tilt);
   if (this->current_operation) {
     buffer.write_raw_byte(40);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->current_operation)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->current_operation));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(6, this->device_id);
@@ -381,7 +381,7 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer &buffer) const {
 #endif
   if (this->entity_category) {
     buffer.write_raw_byte(88);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   for (const char *it : *this->supported_preset_modes) {
     buffer.encode_string(12, it, strlen(it), true);
@@ -420,7 +420,7 @@ void FanStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(3, this->oscillating);
   if (this->direction) {
     buffer.write_raw_byte(40);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->direction)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->direction));
   }
   buffer.encode_int32(6, this->speed_level);
   buffer.encode_string(7, this->preset_mode);
@@ -521,7 +521,7 @@ void ListEntitiesLightResponse::encode(ProtoWriteBuffer &buffer) const {
 #endif
   if (this->entity_category) {
     buffer.write_raw_byte(120);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(16, this->device_id);
@@ -558,7 +558,7 @@ void LightStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_float(3, this->brightness);
   if (this->color_mode) {
     buffer.write_raw_byte(88);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->color_mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->color_mode));
   }
   buffer.encode_float(10, this->color_brightness);
   buffer.encode_float(4, this->red);
@@ -716,12 +716,12 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_string(9, this->device_class);
   if (this->state_class) {
     buffer.write_raw_byte(80);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->state_class)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->state_class));
   }
   buffer.encode_bool(12, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(104);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(14, this->device_id);
@@ -778,7 +778,7 @@ void ListEntitiesSwitchResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(7, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(64);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(9, this->device_class);
 #ifdef USE_DEVICES
@@ -855,7 +855,7 @@ void ListEntitiesTextSensorResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(8, this->device_class);
 #ifdef USE_DEVICES
@@ -913,7 +913,7 @@ bool SubscribeLogsRequest::decode_varint(uint32_t field_id, proto_varint_value_t
 void SubscribeLogsResponse::encode(ProtoWriteBuffer &buffer) const {
   if (this->level) {
     buffer.write_raw_byte(8);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->level)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->level));
   }
   buffer.encode_bytes(3, this->message_ptr_, this->message_len_);
 }
@@ -1153,7 +1153,7 @@ void ListEntitiesServicesArgument::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_string(1, this->name);
   if (this->type) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->type)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->type));
   }
 }
 uint32_t ListEntitiesServicesArgument::calculate_size() const {
@@ -1170,7 +1170,7 @@ void ListEntitiesServicesResponse::encode(ProtoWriteBuffer &buffer) const {
   }
   if (this->supports_response) {
     buffer.write_raw_byte(32);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->supports_response)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->supports_response));
   }
 }
 uint32_t ListEntitiesServicesResponse::calculate_size() const {
@@ -1320,7 +1320,7 @@ void ListEntitiesCameraResponse::encode(ProtoWriteBuffer &buffer) const {
 #endif
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
@@ -1470,7 +1470,7 @@ void ClimateStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.write_tag_and_fixed32(13, this->key);
   if (this->mode) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->mode));
   }
   buffer.encode_float(3, this->current_temperature);
   buffer.encode_float(4, this->target_temperature);
@@ -1478,20 +1478,20 @@ void ClimateStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_float(6, this->target_temperature_high);
   if (this->action) {
     buffer.write_raw_byte(64);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->action)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->action));
   }
   if (this->fan_mode) {
     buffer.write_raw_byte(72);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->fan_mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->fan_mode));
   }
   if (this->swing_mode) {
     buffer.write_raw_byte(80);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->swing_mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->swing_mode));
   }
   buffer.encode_string(11, this->custom_fan_mode);
   if (this->preset) {
     buffer.write_raw_byte(96);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->preset)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->preset));
   }
   buffer.encode_string(13, this->custom_preset);
   buffer.encode_float(14, this->current_humidity);
@@ -1624,7 +1624,7 @@ void ListEntitiesWaterHeaterResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(5, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(48);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(7, this->device_id);
@@ -1665,7 +1665,7 @@ void WaterHeaterStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_float(3, this->target_temperature);
   if (this->mode) {
     buffer.write_raw_byte(32);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->mode));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(5, this->device_id);
@@ -1743,12 +1743,12 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(9, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(80);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(11, this->unit_of_measurement);
   if (this->mode) {
     buffer.write_raw_byte(96);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->mode));
   }
   buffer.encode_string(13, this->device_class);
 #ifdef USE_DEVICES
@@ -1834,7 +1834,7 @@ void ListEntitiesSelectResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(7, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(64);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(9, this->device_id);
@@ -1928,7 +1928,7 @@ void ListEntitiesSirenResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(9, this->supports_volume);
   if (this->entity_category) {
     buffer.write_raw_byte(80);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(11, this->device_id);
@@ -2038,7 +2038,7 @@ void ListEntitiesLockResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_bool(8, this->assumed_state);
   buffer.encode_bool(9, this->supports_open);
@@ -2071,7 +2071,7 @@ void LockStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.write_tag_and_fixed32(13, this->key);
   if (this->state) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->state)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->state));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
@@ -2137,7 +2137,7 @@ void ListEntitiesButtonResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(8, this->device_class);
 #ifdef USE_DEVICES
@@ -2190,7 +2190,7 @@ void MediaPlayerSupportedFormat::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_uint32(3, this->num_channels);
   if (this->purpose) {
     buffer.write_raw_byte(32);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->purpose)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->purpose));
   }
   buffer.encode_uint32(5, this->sample_bytes);
 }
@@ -2213,7 +2213,7 @@ void ListEntitiesMediaPlayerResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_bool(8, this->supports_pause);
   for (auto &it : this->supported_formats) {
@@ -2250,7 +2250,7 @@ void MediaPlayerStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.write_tag_and_fixed32(13, this->key);
   if (this->state) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->state)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->state));
   }
   buffer.encode_float(3, this->volume);
   buffer.encode_bool(4, this->muted);
@@ -2714,15 +2714,15 @@ uint32_t BluetoothDeviceClearCacheResponse::calculate_size() const {
 void BluetoothScannerStateResponse::encode(ProtoWriteBuffer &buffer) const {
   if (this->state) {
     buffer.write_raw_byte(8);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->state)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->state));
   }
   if (this->mode) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->mode));
   }
   if (this->configured_mode) {
     buffer.write_raw_byte(24);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->configured_mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->configured_mode));
   }
 }
 uint32_t BluetoothScannerStateResponse::calculate_size() const {
@@ -3050,7 +3050,7 @@ void ListEntitiesAlarmControlPanelResponse::encode(ProtoWriteBuffer &buffer) con
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_uint32(8, this->supported_features);
   buffer.encode_bool(9, this->requires_code);
@@ -3081,7 +3081,7 @@ void AlarmControlPanelStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.write_tag_and_fixed32(13, this->key);
   if (this->state) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->state)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->state));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(3, this->device_id);
@@ -3144,14 +3144,14 @@ void ListEntitiesTextResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_uint32(8, this->min_length);
   buffer.encode_uint32(9, this->max_length);
   buffer.encode_string(10, this->pattern);
   if (this->mode) {
     buffer.write_raw_byte(88);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->mode)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->mode));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(12, this->device_id);
@@ -3239,7 +3239,7 @@ void ListEntitiesDateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
@@ -3325,7 +3325,7 @@ void ListEntitiesTimeResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
@@ -3411,7 +3411,7 @@ void ListEntitiesEventResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(8, this->device_class);
   for (const char *it : *this->event_types) {
@@ -3470,7 +3470,7 @@ void ListEntitiesValveResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(8, this->device_class);
   buffer.encode_bool(9, this->assumed_state);
@@ -3504,7 +3504,7 @@ void ValveStateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_float(2, this->position);
   if (this->current_operation) {
     buffer.write_raw_byte(24);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->current_operation)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->current_operation));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(4, this->device_id);
@@ -3563,7 +3563,7 @@ void ListEntitiesDateTimeResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(8, this->device_id);
@@ -3639,7 +3639,7 @@ void ListEntitiesUpdateResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(6, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(56);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
   buffer.encode_string(8, this->device_class);
 #ifdef USE_DEVICES
@@ -3764,7 +3764,7 @@ bool ZWaveProxyRequest::decode_length(uint32_t field_id, ProtoLengthDelimited va
 void ZWaveProxyRequest::encode(ProtoWriteBuffer &buffer) const {
   if (this->type) {
     buffer.write_raw_byte(8);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->type)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->type));
   }
   buffer.encode_bytes(2, this->data, this->data_len);
 }
@@ -3786,7 +3786,7 @@ void ListEntitiesInfraredResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_bool(5, this->disabled_by_default);
   if (this->entity_category) {
     buffer.write_raw_byte(48);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->entity_category)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->entity_category));
   }
 #ifdef USE_DEVICES
   buffer.encode_uint32(7, this->device_id);
@@ -3985,11 +3985,11 @@ void SerialProxyRequestResponse::encode(ProtoWriteBuffer &buffer) const {
   buffer.encode_uint32(1, this->instance);
   if (this->type) {
     buffer.write_raw_byte(16);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->type)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->type));
   }
   if (this->status) {
     buffer.write_raw_byte(24);
-    buffer.write_raw_byte(static_cast<uint8_t>(static_cast<uint32_t>(this->status)));
+    buffer.write_raw_byte(static_cast<uint8_t>(this->status));
   }
   buffer.encode_string(4, this->error_message);
 }
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 1097f68c09..812a4d560e 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -1342,7 +1342,7 @@ class EnumType(TypeInfo):
                 return (
                     f"if (this->{self.field_name}) {{\n"
                     f"  buffer.write_raw_byte({tag});\n"
-                    f"  buffer.write_raw_byte(static_cast<uint8_t>({value_expr}));\n"
+                    f"  buffer.write_raw_byte(static_cast<uint8_t>(this->{self.field_name}));\n"
                     f"}}"
                 )
         if self.force: