diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index df968284..a9064648 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -181,7 +181,9 @@ class MeshService : Service(), Logging {
                     position {
                         latitudeI = Position.degI(location.latitude)
                         longitudeI = Position.degI(location.longitude)
-                        altitude = LocationCompat.getMslAltitudeMeters(location).toInt()
+                        if (LocationCompat.hasMslAltitude(location)) {
+                            altitude = LocationCompat.getMslAltitudeMeters(location).toInt()
+                        }
                         altitudeHae = location.altitude.toInt()
                         time = (location.time / 1000).toInt()
                         groundSpeed = location.speed.toInt()