diff --git a/app/src/main/java/com/geeksville/mesh/DataPacket.kt b/app/src/main/java/com/geeksville/mesh/DataPacket.kt
index b462de0fd..c67f42b7e 100644
--- a/app/src/main/java/com/geeksville/mesh/DataPacket.kt
+++ b/app/src/main/java/com/geeksville/mesh/DataPacket.kt
@@ -55,6 +55,12 @@ data class DataPacket(
         else
             null
 
+    val waypoint: MeshProtos.Waypoint?
+        get() = if (dataType == Portnums.PortNum.WAYPOINT_APP_VALUE)
+            MeshProtos.Waypoint.parseFrom(bytes)
+        else
+            null
+
     // Autogenerated comparision, because we have a byte array
 
     constructor(parcel: Parcel) : this(