diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index bbde8226..eec7ee0d 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -17666,6 +17666,9 @@
           }
         }
       }
+    },
+    "Messaging" : {
+
     },
     "Metric" : {
       "localizations" : {
@@ -32903,7 +32906,7 @@
     "Unmessagable" : {
 
     },
-    "Unmonitored or Infrastructure" : {
+    "Unmonitored" : {
 
     },
     "Unset" : {
diff --git a/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift b/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift
index 0c487346..034651be 100644
--- a/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift
+++ b/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift
@@ -15,7 +15,9 @@ extension NodeInfoEntity {
             userProto.shortName = user.shortName ?? ""
             userProto.hwModel = HardwareModel(rawValue: Int(user.hwModelId)) ?? .unset
             userProto.isLicensed = user.isLicensed
-            userProto.isUnmessagable = false
+			if userProto.hasIsUnmessagable == true {
+				userProto.isUnmessagable = user.unmessagable
+			}
 			userProto.role = Config.DeviceConfig.Role(rawValue: Int(user.role)) ?? .client
 			userProto.publicKey = user.publicKey?.subdata(in: 0..<user.publicKey!.count) ?? Data()
         }
diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
index 853387e5..b2c97074 100644
--- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
@@ -154,13 +154,13 @@ struct NodeDetail: View {
 					if node.user?.unmessagable ?? false {
 						HStack {
 							Label {
-								Text("")
+								Text("Messaging")
 							} icon: {
 								Image(systemName: "iphone.slash")
 									.symbolRenderingMode(.multicolor)
 							}
 							Spacer()
-							Text("Unmonitored or Infrastructure")
+							Text("Unmonitored")
 						}
 						.accessibilityElement(children: .combine)
 					}
diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
index b0d602c2..21fd6fa5 100644
--- a/Meshtastic/Views/Nodes/NodeList.swift
+++ b/Meshtastic/Views/Nodes/NodeList.swift
@@ -80,12 +80,14 @@ struct NodeList: View {
 		/// Allow users to mute notifications for a node even if they are not connected
 		if let user = node.user {
 			NodeAlertsButton(context: context, node: node, user: user)
-            Button(action: {
-                shareContactNode = node
-                isPresentingShareContactQR = true
-            }) {
-                Label("Share Contact QR", systemImage: "qrcode")
-            }
+			if !user.unmessagable {
+				Button(action: {
+					shareContactNode = node
+					isPresentingShareContactQR = true
+				}) {
+					Label("Share Contact QR", systemImage: "qrcode")
+				}
+			}
 		}
 		if let connectedNode {
 			/// Favoriting a node requires being connected