diff --git a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt b/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
index 1e8a44f00..fcb16ac07 100644
--- a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
@@ -64,8 +64,8 @@ class NodeDB @Inject constructor(
         nodeInfoDao.apply {
             clearNodeInfo()
             clearMyNodeInfo()
+            setMyNodeInfo(mi) // set MyNodeInfo first
             putAll(nodes)
-            setMyNodeInfo(mi) // set MyNodeInfo last
         }
         val ourNodeInfo = nodes.find { it.num == mi.myNodeNum }
         _ourNodeInfo.value = ourNodeInfo