diff --git a/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift b/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
index 14e954a7..113df743 100644
--- a/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
+++ b/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
@@ -98,7 +98,7 @@ struct NodeMapSwiftUI: View {
 						}
 						/// Node Annotations
 						ForEach(positionArray, id: \.id) { position in
-							let pf = PositionFlags(rawValue: Int(position.nodePosition?.metadata?.positionFlags ?? 3))
+							let pf = PositionFlags(rawValue: Int(position.nodePosition?.metadata?.positionFlags ?? 771))
 							let headingDegrees = Angle.degrees(Double(position.heading))
 							Annotation(position.latest ? node.user?.shortName ?? "?": "", coordinate: position.coordinate) {
 								ZStack {
diff --git a/Meshtastic/Views/Nodes/MeshMap.swift b/Meshtastic/Views/Nodes/MeshMap.swift
index 6d3671bf..51d470d3 100644
--- a/Meshtastic/Views/Nodes/MeshMap.swift
+++ b/Meshtastic/Views/Nodes/MeshMap.swift
@@ -62,7 +62,6 @@ struct MeshMap: View {
 		NavigationStack {
 			ZStack {
 				MapReader { reader in
-					
 					Map(position: $position, bounds: MapCameraBounds(minimumDistance: 1, maximumDistance: .infinity), scope: mapScope) {
 						/// Waypoint Annotations
 						if waypoints.count > 0 && showWaypoints {
@@ -112,23 +111,17 @@ struct MeshMap: View {
 								}
 							}
 							/// Route Lines
-							if showRouteLines  {
-								let positionArray = position.nodePosition?.positions?.array as? [PositionEntity] ?? []
-								let routeCoords = positionArray.compactMap({(position) -> CLLocationCoordinate2D in
-									return position.nodeCoordinate ?? LocationHelper.DefaultLocation
-								})
-								if showRouteLines {
-									let gradient = LinearGradient(
-										colors: [Color(nodeColor.lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
-										startPoint: .leading, endPoint: .trailing
-									)
-									let dashed = StrokeStyle(
-										lineWidth: 3,
-										lineCap: .round, lineJoin: .round, dash: [10, 10]
-									)
-									MapPolyline(coordinates: routeCoords)
-										.stroke(gradient, style: dashed)
-								}
+							if showRouteLines {
+								let gradient = LinearGradient(
+									colors: [Color(nodeColor.lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
+									startPoint: .leading, endPoint: .trailing
+								)
+								let dashed = StrokeStyle(
+									lineWidth: 3,
+									lineCap: .round, lineJoin: .round, dash: [10, 10]
+								)
+								MapPolyline(coordinates: lineCoords)
+									.stroke(gradient, style: dashed)
 							}
 							/// Node History
 							if showNodeHistory {