From 22a2d687237d9f49024bfb8641043cc8e99b32f0 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Tue, 27 May 2025 18:37:35 -0500
Subject: [PATCH] Additionally null it out on send

---
 src/modules/NodeInfoModule.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp
index e072fcb0f..9c37c94b8 100644
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -81,8 +81,11 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
         ignoreRequest = true; // Mark it as ignored for MeshModule
         return NULL;
     } else {
-        ignoreRequest = false; // Don't ignore requests anymore
-        meshtastic_User &u = owner;
+        ignoreRequest = false;     // Don't ignore requests anymore
+        meshtastic_User u = owner; // Create a copy to avoid modifying the global owner
+
+        // Null out user.id on transmit
+        u.id[0] = 0;
 
         // Strip the public key if the user is licensed
         if (u.is_licensed && u.public_key.size > 0) {