diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
index 51a3e3c8c..43ccb9557 100644
--- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
@@ -469,7 +469,7 @@ class UIViewModel @Inject constructor(
                         // If the packet contains position data then use it to update, if valid
                         packet.position?.let { position ->
                             positionToPos.invoke(position)?.let {
-                                nodePositions[proto.from] = position
+                                nodePositions[proto.from.takeIf { it != 0 } ?: myNodeNum] = position
                             }
                         }