diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
index 9f828ad2..559d2ff5 100644
--- a/Meshtastic.xcodeproj/project.pbxproj
+++ b/Meshtastic.xcodeproj/project.pbxproj
@@ -1427,7 +1427,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.10;
+				MARKETING_VERSION = 2.2.11;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1461,7 +1461,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.10;
+				MARKETING_VERSION = 2.2.11;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1583,7 +1583,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.10;
+				MARKETING_VERSION = 2.2.11;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1616,7 +1616,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.10;
+				MARKETING_VERSION = 2.2.11;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Meshtastic/Views/Nodes/MeshMap.swift b/Meshtastic/Views/Nodes/MeshMap.swift
index 51d470d3..22341dd4 100644
--- a/Meshtastic/Views/Nodes/MeshMap.swift
+++ b/Meshtastic/Views/Nodes/MeshMap.swift
@@ -112,6 +112,10 @@ struct MeshMap: View {
 							}
 							/// Route Lines
 							if showRouteLines {
+								let nodePositions = Array(position.nodePosition!.positions!) as! [PositionEntity]
+								let routeCoords = nodePositions.compactMap({(pos) -> CLLocationCoordinate2D in
+									return pos.nodeCoordinate ?? LocationHelper.DefaultLocation
+								})
 								let gradient = LinearGradient(
 									colors: [Color(nodeColor.lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
 									startPoint: .leading, endPoint: .trailing
@@ -120,12 +124,12 @@ struct MeshMap: View {
 									lineWidth: 3,
 									lineCap: .round, lineJoin: .round, dash: [10, 10]
 								)
-								MapPolyline(coordinates: lineCoords)
+								MapPolyline(coordinates: routeCoords)
 									.stroke(gradient, style: dashed)
 							}
 							/// Node History
-							if showNodeHistory {
-								ForEach(Array(position.nodePosition!.positions!) as! [PositionEntity], id: \.self) { (mappin: PositionEntity) in
+							ForEach(Array(position.nodePosition!.positions!) as! [PositionEntity], id: \.self) { (mappin: PositionEntity) in
+								if showNodeHistory {
 									if mappin.latest == false && mappin.nodePosition?.user?.vip ?? false {
 										let pf = PositionFlags(rawValue: Int(mappin.nodePosition?.metadata?.positionFlags ?? 771))
 										let headingDegrees = Angle.degrees(Double(mappin.heading))
@@ -140,7 +144,7 @@ struct MeshMap: View {
 														.clipShape(Circle())
 														.rotationEffect(headingDegrees)
 														.frame(width: 16, height: 16)
-											
+													
 												} else {
 													Circle()
 														.fill(Color(UIColor(hex: UInt32(mappin.nodePosition?.num ?? 0))))