diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index a6c22da..37c9341 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -32,6 +32,7 @@
 *MyNodeInfo.air_period_rx       max_count:8
 
 *MyNodeInfo.firmware_edition int_size:8
+*MyNodeInfo.nodedb_count int_size:16
 
 # Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256
 # here because we might need to fill with zeros for padding to encryption block size (16 bytes per block)
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 19b0b0e..9f96aa5 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1706,6 +1706,12 @@ message MyNodeInfo {
    * The indicator for whether this device is running event firmware and which
    */
   FirmwareEdition firmware_edition = 14;
+
+  /*
+   * The number of nodes in the nodedb.
+   * This is used by the phone to know how many NodeInfo packets to expect on want_config
+   */
+  uint32 nodedb_count = 15;
 }
 
 /*