diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 6d13a2d8..d7a80c17 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -961,43 +961,44 @@ func textMessageAppPacket(
 							manager.schedule()
 							Logger.services.debug("iOS Notification Scheduled for text message from \(newMessage.fromUser?.longName ?? "unknown".localized)")
 						}
-					} else if newMessage.toUser == nil {
+					} else if newMessage.fromUser != nil && newMessage.toUser == nil {
 						let fetchMyInfoRequest = MyInfoEntity.fetchRequest()
-fetchMyInfoRequest.predicate = NSPredicate(format: "myNodeNum == %lld", Int64(connectedNode))
+						fetchMyInfoRequest.predicate = NSPredicate(format: "myNodeNum == %lld", Int64(connectedNode))
 
-do {
-    let fetchedMyInfo = try context.fetch(fetchMyInfoRequest)
-    if !fetchedMyInfo.isEmpty {
-        appState.unreadChannelMessages = fetchedMyInfo[0].unreadMessages
+						do {
+							let fetchedMyInfo = try context.fetch(fetchMyInfoRequest)
+							if !fetchedMyInfo.isEmpty {
+								appState.unreadChannelMessages = fetchedMyInfo[0].unreadMessages
 
-        for channel in (fetchedMyInfo[0].channels?.array ?? []) as? [ChannelEntity] ?? [] {
-            if channel.index == newMessage.channel {
-                context.refresh(channel, mergeChanges: true)
-            }
-            if channel.index == newMessage.channel && !channel.mute && UserDefaults.channelMessageNotifications {
-                // Create an iOS Notification for the received private channel message and schedule it immediately
-                let manager = LocalNotificationManager()
-                manager.notifications = [
-                    Notification(
-                        id: ("notification.id.\(newMessage.messageId)"),
-                        title: "\(newMessage.fromUser?.longName ?? \"unknown\".localized)",
-                        subtitle: "AKA \(newMessage.fromUser?.shortName ?? \"?\")",
-                        content: messageText!,
-                        target: "messages",
-                        path: "meshtastic:///messages?channelId=\(newMessage.channel)&messageId=\(newMessage.messageId)",
-                        messageId: newMessage.messageId,
-                        channel: newMessage.channel,
-                        userNum: Int64(newMessage.fromUser?.userId ?? "0"),
-                        critical: critical)
-                ]
-                manager.schedule()
-                Logger.services.debug("iOS Notification Scheduled for text message from \(newMessage.fromUser?.longName ?? \"unknown\".localized)")
-            }
-        }
-    }
-} catch {
-    // Handle error
-}
+								for channel in (fetchedMyInfo[0].channels?.array ?? []) as? [ChannelEntity] ?? [] {
+									if channel.index == newMessage.channel {
+										context.refresh(channel, mergeChanges: true)
+									}
+									if channel.index == newMessage.channel && !channel.mute && UserDefaults.channelMessageNotifications {
+										// Create an iOS Notification for the received private channel message and schedule it immediately
+										let manager = LocalNotificationManager()
+										manager.notifications = [
+											Notification(
+												id: ("notification.id.\(newMessage.messageId)"),
+												title: "\(newMessage.fromUser?.longName ?? "unknown".localized)",
+												subtitle: "AKA \(newMessage.fromUser?.shortName ?? "?")",
+												content: messageText!,
+												target: "messages",
+												path: "meshtastic:///messages?channelId=\(newMessage.channel)&messageId=\(newMessage.messageId)",
+												messageId: newMessage.messageId,
+												channel: newMessage.channel,
+												userNum: Int64(newMessage.fromUser?.userId ?? "0"),
+											    critical: critical)
+										]
+										manager.schedule()
+										Logger.services.debug("iOS Notification Scheduled for text message from \(newMessage.fromUser?.longName ?? "unknown".localized)")
+									}
+								}
+							}
+						} catch {
+							// Handle error
+						}
+					}
 				}
 			} catch {
 				context.rollback()
@@ -1010,7 +1011,6 @@ do {
 	}
 }
 
-
 func waypointPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 
 	let logString = String.localizedStringWithFormat("mesh.log.waypoint.received %@".localized, String(packet.from))