diff --git a/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift b/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift
index 6e05c939..ea94739f 100644
--- a/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift
+++ b/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift
@@ -197,6 +197,13 @@ struct MapViewSwiftUI: UIViewRepresentable {
 					lineIndex = 0
 				}
 			}
+		} else {
+			// Remove all existing PolyLine Overlays
+			for overlay in mapView.overlays {
+				if overlay is MKPolyline {
+					mapView.removeOverlay(overlay)
+				}
+			}
 		}
 		
 		//DispatchQueue.main.async {