diff --git a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
index bfbcd6c7a..0c6ffe4b1 100644
--- a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
@@ -328,7 +328,7 @@ class BTScanModel @Inject constructor(
     @SuppressLint("MissingPermission")
     private fun addBluetoothDevices() {
         bluetoothRepository.getBondedDevices()
-            ?.filter { it.name.matches(Regex(BLE_NAME_PATTERN)) }
+            ?.filter { it.name != null && it.name.matches(Regex(BLE_NAME_PATTERN)) }
             ?.forEach {
                 addDevice(DeviceListEntry(it.name, "x${it.address}", true))
             }