diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 9b02a1d93..f43e9b8d7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -418,12 +418,14 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
                 val selectedAddr = scanModel.selectedMacAddr
                 if (!hasShownOurDevice && selectedAddr != null) {
                     val bDevice = scanModel.bluetoothAdapter!!.getRemoteDevice(selectedAddr)
-                    val curDevice = BTScanModel.BTScanEntry(
-                        bDevice.name,
-                        bDevice.address,
-                        bDevice.bondState == BOND_BONDED
-                    )
-                    addDeviceButton(curDevice, false)
+                    if (bDevice.name != null) { // ignore nodes that node have a name, that means we've lost them since they appeared
+                        val curDevice = BTScanModel.BTScanEntry(
+                            bDevice.name,
+                            bDevice.address,
+                            bDevice.bondState == BOND_BONDED
+                        )
+                        addDeviceButton(curDevice, false)
+                    }
                 }
             }