diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index cb85daa1..4e335d2a 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -25,6 +25,7 @@
 
 # Big enough for 1.2.28.568032c-d
 *MyNodeInfo.firmware_version max_size:18
+*MyNodeInfo.device_id max_size:16
 
 *MyNodeInfo.air_period_tx       max_count:8
 *MyNodeInfo.air_period_rx       max_count:8
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index a48adbc2..f53ef969 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1461,7 +1461,7 @@ message MyNodeInfo {
   /*
    * Unique hardware identifier for this device
    */
-  uint64 device_id = 12;
+  bytes device_id = 12;
 }
 
 /*