diff --git a/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt b/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
index 03b740d81..1879a828a 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
@@ -161,9 +161,7 @@ class NodeInfoDaoTest {
     @Test
     fun testIncludeUnknownIsFalse() = runBlocking {
         val nodes = getNodes(includeUnknown = false)
-        val containsUnsetNode = nodes.any { node ->
-            node.user.hwModel == MeshProtos.HardwareModel.UNSET
-        }
+        val containsUnsetNode = nodes.any { it.isUnknownUser }
         assertFalse(containsUnsetNode)
     }
 
diff --git a/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt b/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt
index 70f080441..27498e470 100644
--- a/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt
@@ -84,6 +84,7 @@ data class NodeEntity(
             return (if (brightness > 0.5) Color.BLACK else Color.WHITE) to Color.rgb(r, g, b)
         }
 
+    val isUnknownUser get() = user.hwModel == MeshProtos.HardwareModel.UNSET
     val hasPKC get() = !user.publicKey.isEmpty
     val errorByteString: ByteString get() = ByteString.copyFrom(ByteArray(32) { 0 })
     val mismatchKey get() = user.publicKey == errorByteString
diff --git a/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt b/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
index 9c2315cee..46450b789 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
@@ -79,7 +79,7 @@ fun NodeItem(
     expanded: Boolean = false,
     currentTimeMillis: Long,
 ) {
-    val isUnknownUser = thatNode.user.hwModel == MeshProtos.HardwareModel.UNSET
+    val isUnknownUser = thatNode.isUnknownUser
     val unknownShortName = stringResource(id = R.string.unknown_node_short_name)
     val longName = thatNode.user.longName.ifEmpty { stringResource(id = R.string.unknown_username) }