diff --git a/app/src/google/java/com/geeksville/mesh/ui/map/components/WaypointMarkers.kt b/app/src/google/java/com/geeksville/mesh/ui/map/components/WaypointMarkers.kt
index 756e0880e..5a19809e3 100644
--- a/app/src/google/java/com/geeksville/mesh/ui/map/components/WaypointMarkers.kt
+++ b/app/src/google/java/com/geeksville/mesh/ui/map/components/WaypointMarkers.kt
@@ -52,8 +52,8 @@ fun WaypointMarkers(
                 } else {
                     unicodeEmojiToBitmapProvider(waypoint.icon)
                 },
-                title = waypoint.name,
-                snippet = waypoint.description,
+                title = waypoint.name.replace('\n', ' ').replace('\b', ' '),
+                snippet = waypoint.description.replace('\n', ' ').replace('\b', ' '),
                 visible = true,
                 onInfoWindowClick = {
                     if (waypoint.lockedTo == 0 || waypoint.lockedTo == myNodeNum || !isConnected) {