diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
index 383471f2d3..6e10878731 100644
--- a/selfdrive/boardd/boardd.cc
+++ b/selfdrive/boardd/boardd.cc
@@ -516,7 +516,7 @@ void can_health(PubSocket *publisher) {
   healthData.setPowerSaveEnabled((bool)(health.power_save_enabled));
 
   // Convert faults bitset to capnp list
-  std::bitset<32> fault_bits(health.faults);
+  std::bitset<sizeof(health.faults) * 8> fault_bits(health.faults);
   auto faults = healthData.initFaults(fault_bits.count());
 
   size_t i = 0;