diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index b2d66a3b..58395c37 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -877,7 +877,13 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 			case .waypointApp:
 				waypointPacket(packet: decodedInfo.packet, context: context)
 			case .nodeinfoApp:
-				if !invalidVersion { upsertNodeInfoPacket(packet: decodedInfo.packet, context: context) }
+				guard let peripheral = self.connectedPeripheral else {
+					Logger.mesh.error("🕸️ connectedPeripheral is nil. Unable to determine connectedNodeNum for node info upsert.")
+					return
+				}
+				if Int64(truncatingIfNeeded: decodedInfo.packet.from) != peripheral.num {
+					upsertNodeInfoPacket(packet: decodedInfo.packet, context: context)
+				}
 			case .routingApp:
 				if !invalidVersion {
 					guard let peripheral = self.connectedPeripheral else {
diff --git a/protobufs b/protobufs
index 27fac391..e2c0831a 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 27fac39141d99fe727a0a1824c5397409b1aea75
+Subproject commit e2c0831aa3d34a58a36c2b9fdcb828e58961cbc5